From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764252401; cv=none; d=zohomail.com; s=zohoarc; b=XvA9qympUTFQDR4Gad3hyDyIF0+j8HljsAi1OctFQoRn7kC56sSz/IGg0zvs+vooKuteUFtMGp8SX8h+i+owpli7qfx9PoOkZIfI7SI0VdLqMv3lNfsEba74OVQ/qY8T3SUZhzL03UJESeVOLOoiPCs7iY5FWIJ/HpWlIxV4w7Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764252401; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=nudtLyfLpePiOGbflXoAvWZ1qHAsYssnltuIZxxkF4g=; b=HxwUX07C+M7dd/AWZ3VtujoaRu15Xo5nJlr9s1pM0j0FFl0RtIKalmygIgPRaMNnxqCK7TGnGB8VQImKY5OubS0Kx9az017k5wJjJRg6uyIbaZRy/yc8E8/1YfBWrcmCtKDQRdE8d77gydvdLhTQIMODl1K88Nrd/nESbPyivrk= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764252401806690.4730513600601; Thu, 27 Nov 2025 06:06:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObqQ-0002YT-NU; Thu, 27 Nov 2025 08:15:34 -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 1vObqL-0002Xi-K9 for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:29 -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 1vObqI-0001A4-81 for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:27 -0500 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-662-HBQEjPHeNKeAkWEMq4kyeA-1; Thu, 27 Nov 2025 08:15:21 -0500 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-640bae7d83aso957828a12.2 for ; Thu, 27 Nov 2025 05:15:21 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-647510615c0sm1541102a12.30.2025.11.27.05.15.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nudtLyfLpePiOGbflXoAvWZ1qHAsYssnltuIZxxkF4g=; b=FpgMPe5xANSk2O74w7r6AEnX8lIZo+FsIAaf/iClPOkoQ72d8Kk8TGhjWf75wjsLPShtTX zHZaWzmkVotZZtK6gScHYNVLfKYfhGgRtMco5yuZvbFZMFeBRtGyqK2gz4oxUGva7eaYyX z7r80xiL7tdl7nu5ZK8dfRoP/vT2Pzw= X-MC-Unique: HBQEjPHeNKeAkWEMq4kyeA-1 X-Mimecast-MFC-AGG-ID: HBQEjPHeNKeAkWEMq4kyeA_1764249321 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249320; x=1764854120; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=nudtLyfLpePiOGbflXoAvWZ1qHAsYssnltuIZxxkF4g=; b=DAMoHQhJhNK/Vu+uZqbxcvLegANYEfXHXMV2ukuqDyOHnAjqz5rzLdZ8KTmhV3Sbqv HvJPOBvA7korhoyD2OY3IANtKbYP37+Z2mR1KQPAU+VMr1LIpV3fcAwzgKw/g2F5BseD UMVcDXLI1ACzaeapaSrAW3iiyEIjNgW+6wMss5ujJWpOYaFhTE+FAHAwDqP4elaQh/Um cxeUhBn1fYalXR212cmIYgwoaH72sye/pXjDuMPKVxECEBOVNDYTE2fPCX8T8POAlAK5 ZAJ43qTEazgAGrjKKudfP+FaGMke0AGWc3lhDb8heYWo1d1BlMVjaFRfVaZcopwONmsd xAzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249320; x=1764854120; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=nudtLyfLpePiOGbflXoAvWZ1qHAsYssnltuIZxxkF4g=; b=Dj/xnBnpGESepuLseBtcVUTcxWSi4NgHlMyQGjLJ66duo4PRqiSJ72YCni/794Hbvb Yv1TQD6pQcXtyIZwbv5B2EIxU19dO+DhVy6xGlfNoXOpKxk5Zg+2DZOcSjrs2u4/VhUi dc7FxfG5n3+xJW934InIg3REucrUFWzl37XyICBUO2O6Z01WGpF+5CUIlvzD4VrdZQIK DRLWWKa56GogqFFfexSOZz7AMafTmHMVmDQ4T4T/R7BI2AfH0nhJ7HEsg3yuUPBRMWjk 8WeRz1iHwF5+r5O8rGWJuquWiloHKcq2CAgg2C9+ijKpE8Gm62wexXOhICQeAMixYHFH q0Vw== X-Gm-Message-State: AOJu0YyoKW5NPybXd4wMJ1/6+cNcfCa3GIYajJU9saFogmRW05yqlJ0D qCZrczXiMVUG6uUCfRtssKa/OXGFBIKqEnZkDcvZ/9gQTgJg/lZyuynZdkNQXvdBnUMslMUCnUk E1esaTKuYLIpKfkfx0cfajQipqDOS5C7sE/ciqMe1/1Grebl8Da/I2wlo6IyeHFLRbU2JrpS6AG JoyrWqkHO+rJ+Z+BVl2E/wKbunp/Sq7vVMCAyq9g7Q X-Gm-Gg: ASbGncuqeZ94bcQIo+OgxAslWAGgkhGM1FNznv0XAanS9eoVIzhgfDImw61eazAWFvZ GMlM0X8r01g2XrMweSYCDjWD51surIzmTCiQTEt7KBjbAWXlLXYlGfMQSFhahaAe4D3WLYmeSwG CSBiF6imF7Z4rkrcednM9vE+Kms5PRkK+/hQBfpTrQxJUrQjrfpgNRbdqG4IVSgXnhViN4jWDeo 3UuYLiPtIxOsz9T/XsA83xsjcQnR/2sOPkXaUX20wo9uY0EWUdvC+PcjazgKx6QALor7Er+jQ5N j4JqYx64F6pwdkF+qDsnZ5iyfhacU5rGfNnfUciMgOZVmcEmyoihbbiFYyTo6FPXZfzG0WfHoWu tJdaWCY+EVC8K+eaOTNjSmT3m8eXcBAr3ho5gOtGBdDSaAn4BqLv7OFCoNfMB4sUq2zYjlwjmfD cvOAY7w/Fhso6ptJQ= X-Received: by 2002:a05:6402:27c8:b0:634:b7a2:3eaf with SMTP id 4fb4d7f45d1cf-64554664dd9mr22772820a12.18.1764249319870; Thu, 27 Nov 2025 05:15:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IHq+3JBYq0VHEnpAKXaHuGEjh6pmImjM+gkuEc+MaGrfw/Wg0MQ/6FuuWSaUFa7LPFNqhgarg== X-Received: by 2002:a05:6402:27c8:b0:634:b7a2:3eaf with SMTP id 4fb4d7f45d1cf-64554664dd9mr22772786a12.18.1764249319398; Thu, 27 Nov 2025 05:15:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 01/28] include: move qemu_irq_handler out of typedefs.h Date: Thu, 27 Nov 2025 14:14:48 +0100 Message-ID: <20251127131516.80807-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764252403445019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- include/hw/irq.h | 2 ++ include/hw/qdev-core.h | 1 + include/qemu/typedefs.h | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/hw/irq.h b/include/hw/irq.h index 291fdd67df4..81b81ed493c 100644 --- a/include/hw/irq.h +++ b/include/hw/irq.h @@ -8,6 +8,8 @@ #define TYPE_IRQ "irq" OBJECT_DECLARE_SIMPLE_TYPE(IRQState, IRQ) =20 +typedef void (*qemu_irq_handler)(void *opaque, int n, int level); + struct IRQState { Object parent_obj; =20 diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 2caa0cbd26f..9802b6896de 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -8,6 +8,7 @@ #include "qemu/rcu_queue.h" #include "qom/object.h" #include "hw/hotplug.h" +#include "hw/irq.h" #include "hw/resettable.h" =20 /** diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 4a94af9665a..cf931ff549c 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -132,7 +132,6 @@ typedef struct IRQState *qemu_irq; /* * Function types */ -typedef void (*qemu_irq_handler)(void *opaque, int n, int level); typedef bool (*MigrationLoadThread)(void *opaque, bool *should_quit, Error **errp); typedef bool (*SaveCompletePrecopyThreadHandler)(SaveCompletePrecopyThread= Data *d, --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764252162; cv=none; d=zohomail.com; s=zohoarc; b=jD9moFNpGbpRpI3lZMld3GZKeG1IIg6NnROLFMKQcHDQ9EwSTtSa5Ua8rILce1h4Te0mM6xfmvtrNUWUJtzHAB2nSOsO/rW7eKCVUcY6XdS5wwDTLcRXX/KUV7n/HS8C2W4jZoz7ziOB2CRzOxLPdLmQXDaJBHw2/fqgCIGRWRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764252162; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=VCvRN3OWsF1O4M8RCr/9wSLhXxc99p7+KHRdfTdsKPk=; b=RYVFofJrPH5F+3kQ/KEEcRldbScMhS6ThENEP2VlFMqiW4qcB6jbEjfIHcjk+UXOn3YW/aRz4MjnppOp+vGhdE155NyoqUyYaHi8KUEvQ6UKsK7RJfzQNBI1zojiS3+Pqu0c36+XxkMDxG+dlXwrD0h0cdtIS4ZdaR+a400DZa8= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764252162023959.5685227038294; Thu, 27 Nov 2025 06:02:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObqc-0002cW-RB; Thu, 27 Nov 2025 08:15:46 -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 1vObqL-0002Xh-Jx for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:29 -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 1vObqI-0001AI-84 for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:28 -0500 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-190-rHUzViLvNAWn3wLlEQz_ow-1; Thu, 27 Nov 2025 08:15:22 -0500 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-b763acb793fso81452466b.3 for ; Thu, 27 Nov 2025 05:15:22 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f59eb401sm153647966b.54.2025.11.27.05.15.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VCvRN3OWsF1O4M8RCr/9wSLhXxc99p7+KHRdfTdsKPk=; b=EplMVTLsbi5VtTwOYGf/zR6AuUepEw7ZmK/xcL0Nu0tZTV0x/QabYKsGsaGbbin/MVeQje xZQX91ACe7j9tkbKyslUhwTX5Pch/XilZ5nd3z7qBFNghgZiTQZ1Y1UvcB93RUeCUup+rZ ju9yA+zNdRirmthUlSTqC7BfCgYAkU0= X-MC-Unique: rHUzViLvNAWn3wLlEQz_ow-1 X-Mimecast-MFC-AGG-ID: rHUzViLvNAWn3wLlEQz_ow_1764249321 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249321; x=1764854121; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VCvRN3OWsF1O4M8RCr/9wSLhXxc99p7+KHRdfTdsKPk=; b=JCM+s/QPh6X27zD2c/rOPTyskwsgLbOrm+T1cj//lQBsy8MJ6YStblZaP2ozjUMKF3 XUs42xaVZqPOVVE3MBlQ2fIxKbIlLWWF/uhoKU3R2PbM1dlKNP022A+b9867FBfNRfUg nGXkyDAy08iiKPA0q09gpzO8Zms9BBF7JCRnS54k4ghZlDl0iWK25AekaBfxs4YC+XwF 2QMVR7u/+w+sniMBr4wa4d9lLOXUTynTYFDXcgk/7rpDojBW/MFUZxDo3sim+UkCQoBR PYPUUR4xmRXhG2vIPgnbybuktVnTbkwzd5YxYhnhv+Vxa24fwh7sdMCuXp2U3GOBmfXL MPFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249321; x=1764854121; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=VCvRN3OWsF1O4M8RCr/9wSLhXxc99p7+KHRdfTdsKPk=; b=VjifBPcaGZ9LdlBa4hAL4r0yC1/fn+9LZbzNiOluBSW07g7zj4q15AU8yUmnMxKhwJ J/7V8aN4T6utd8BD+qrxjh4eUlIKBiBb8pPlHA2ZHBDFS6eiQGma6WUj37d8TQSjGZTY 2Dez16mFAsH41Dy0WvpPVKvH2nQdvSjNcZxIu8XFvHIsoN6/EUh9/xb8YUd/lwyev6Oo 5PUZYZcLQ377iK6qvvQrZx5RZ6iMWqYWTtCyBpvh7ghv6LDV36dne0YEquqtWNjFf9o3 QFZ12RvgwdqmkGE77VJC0YraI9Cm6elbGyoUi4RfP7iBdop+E5kJWitJnOrOymHOWg8u saxw== X-Gm-Message-State: AOJu0YyvuSFIO70bsDpzeQPy3PeQz5e73ZP8c91CduL2BiM0MoKoK4jm AtEsUE8v9WkEhPK/rinx7tCAOfomVZMMWSbIVZ2NivTc3v90HCOycGgaPvOcudrHqZf1ONGWo9g R8pz36I11fqIVLBQQgeGEI315xODUb8fw9eF/a/bNYRZDcl1Pn5ltNrgXlvXWwDEOiCs8dxrw/f qpvf5bSoALYS25d4S5XwQgeMMUGcq+heUENvsP4MFR X-Gm-Gg: ASbGncucfksmn558s1ozb2U20ty2S9IHwlFfk4YhrxAUTcff0yF3//gkHZ8Ou+tS83w WklDRmIcb49T5tLU1qq2V/Di9KTN2rNkQeCDM+KNSqMqSYJRDjblZd8aD2vT1NRLu47guX5LiZ5 WO2OU05/PGQVuubSPfHoj9zbsmp1jlbl9BtqPD7nXhey+jLFNllTRcOFDv0vJlWii6BDyZ21Mo/ J3avANmTzeGBf2O5Go0/vgj7bBxhH7xZ369ICYtBKoFmRcu3ybZJZQx6zUCdEzSytuPcjJKLpfM g3O5CmlogKRuIigowJ5ObQVLGgddvkXb11aC8ntHrYVGJf1Fd4Oc5t4IYswBBygPZOKyiYQgsYH YWYkGRRIXtoO73ZWD4Gvc0dHJ1GjCehRTiyWP2tNEdOGkc4n3Ye80Omg9hIL9M/R7zMiiYuuQ9L cIJN1bd6AFm4Q++qo= X-Received: by 2002:a17:907:7ba1:b0:b76:b7fe:3198 with SMTP id a640c23a62f3a-b76c5514685mr1220214566b.26.1764249321030; Thu, 27 Nov 2025 05:15:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IHjQiX6akvTpQn6cIkESqS1So+Y0aaXF9df3jVMBUm6k0KOUMc4pjj2mz6IUMPNwAZlXf5Dnw== X-Received: by 2002:a17:907:7ba1:b0:b76:b7fe:3198 with SMTP id a640c23a62f3a-b76c5514685mr1220210266b.26.1764249320445; Thu, 27 Nov 2025 05:15:20 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 02/28] include: name the MemReentrancyGuard struct Date: Thu, 27 Nov 2025 14:14:49 +0100 Message-ID: <20251127131516.80807-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764252163295019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- include/hw/qdev-core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 9802b6896de..018c134011e 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -209,7 +209,7 @@ struct NamedClockList { QLIST_ENTRY(NamedClockList) node; }; =20 -typedef struct { +typedef struct MemReentrancyGuard { bool engaged_in_io; } MemReentrancyGuard; =20 --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764252441; cv=none; d=zohomail.com; s=zohoarc; b=W5jS9DdJqowgYSJDvlqDYzjNE1dmOdXnFQYGDSU4dmXxV2WheQckAllynGJ6WDOB8aT5Q6F8JP0Apb8HnXKkUv8g3MLys/TUeu31BEd5fF/58/cJ9LatMj6hpvmCOt2IzCny0FJ+hz7VSH9gMvDwXqCSQ8b0Lv1EDO+JOjoXyDU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764252441; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=J6yV2ugWSQyxugBrT4c6BtU88GZrRVXnneMuP01QvJk=; b=N549tgaxid/JfL+tMLO5ZjzeEs026N6QIF7pq542qXAepuSJCMWCsQ0Q4bprMcQa2IUqaS4rl5kCF4FJ0Zik9o+WqxbeS3kH9JxCHhPtkOZEf6ZE4Jytl6LOTkJc/jcxOrrxAHtcMF6fM2+4Hi9yVVW4mY07+3bILDKWx2GkRSM= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176425244120239.794912684480096; Thu, 27 Nov 2025 06:07:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObqQ-0002Ye-O6; Thu, 27 Nov 2025 08:15:34 -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 1vObqM-0002Y1-Ry for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:30 -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 1vObqJ-0001B0-M1 for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:30 -0500 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-50-A62_lV20MoGVPiepgnQnJg-1; Thu, 27 Nov 2025 08:15:25 -0500 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-b733b21a138so90601866b.1 for ; Thu, 27 Nov 2025 05:15:25 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f519e2f0sm161939166b.21.2025.11.27.05.15.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J6yV2ugWSQyxugBrT4c6BtU88GZrRVXnneMuP01QvJk=; b=ESM4wLARhFaMHprejIETos1nS1ejmmjgMV5Ty3dxrKJU+GmjMDP2ySEXUG7y0m+UmqCuvE INYMcv5jgTLq4suGxhokNBW+wdzUWzuPrRm6qUT5G/cNyQh8XML8tw2whu9Wu+ihbaH0AW pXi+4W9wdmeqB1EcfSYggDygbAwRXJ0= X-MC-Unique: A62_lV20MoGVPiepgnQnJg-1 X-Mimecast-MFC-AGG-ID: A62_lV20MoGVPiepgnQnJg_1764249324 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249324; x=1764854124; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=J6yV2ugWSQyxugBrT4c6BtU88GZrRVXnneMuP01QvJk=; b=H9ZCrGgzwDt8cI6nUBOeGr97vrT77z5EUm1oc/43Fr1yMyEEmyN+iHu6X47DRNWPY7 yFdVi4yGLTT3IpzygkPHPKuPj3t4ajsQaR1GPIlRvJbgB/4ayQs71aG/rJEsKWcHMIpQ 0nrn9RxNJgDFF8nztqKT1UqzttksHPYvnrvEIh+bUNcp+WeZe8PJmV/rKn5a5ye2Zam3 PdmjeNviRQVrByx67YhXnyIcWslwd74kfqTr3+cVhRzRr4WUAL9/NCYYogta1llc6kAN eU5HEDLbekfh2A+Kuzp7DZmbGpbktx8O9n8YrZhZkXCdaDiSaejXthjULf5qfVYImIBE qkSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249324; x=1764854124; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=J6yV2ugWSQyxugBrT4c6BtU88GZrRVXnneMuP01QvJk=; b=OO5ZGlWhtHJe6cNcWQvE/P2WeoJddHFrfzFxmwEbxG8/Lbdz0SdvpCie/83b/lcmih 3Cj8tt7UnPwPiGkVARKsOfi12SO1V4u381QDTKdoyQkscR3io/IXaFAa8u5PV/Z+169n O8qxnIQiwkf+dwhL5R12fq7uTQrJfP4JSf18HIGU3IPjwx/fjNXv8BLdB4UAwCuIHPD4 QNkNwxb1fM/mqcifi7BgFiPwP/3WCnqjPbzpcaaDIV26xs/e1UX79p3f2ttCRKTE0C0s iOCGSqWuYgBFfYKrHuyTkJDHO9IO5qa8CRyqBbt83WRJ8/d7orQC81qau2WVjWMHAHBx c99w== X-Gm-Message-State: AOJu0YzNuaRgWsEbw+seFQTqdPfPIIzR0S3dR+pNjywpPXJQTH/4HkDL 1LcYYiqHW3ALiwJEwMSz7LwpSf9riHuXhkQMOoasmxib/TvIW2md+q9YcjNO3vMrnBLK6DUY9PT rqqhddGCgsShVHir/wocSPICTsE1E8abrgH3AupGqKBzpU53B57TXQkv5YnnQeRrgZlD6y4/tdl wDTwqJeAs16eLUescj1vIJWck8Hc8r1zd/rrpM4WLX X-Gm-Gg: ASbGncttMcy5LnPQ0rReqXauhAh3bjyUKelPRQjXGMUjEivXbQ5Utj0D230PlTFAAN9 lCYIA9vNq3C7/gI6KGNDYiBFFvmN/0gUWwKs6I+gcYUCz+cmDe9zVunzdr2KCSnZ7uD3cxM4tPi J1GSbRDsdR2ISmXBi0wh2S/DQa/Gy52cUBjJKpe06ffTUEW8qkVub4sIgfHdAUWoW17UiIp/2dF JmNx8c+dUTtALy6Vzh5PXagngSAsJIzx0Y4j9ARvIEopPdkxFEfqDpXRoT6UQE8Mg/q0oYCbBw/ ZecuQJtjbkS5JY8L4mEBBYNB0NuMV+MCS7XjO0ng5ezRLsEwHrsdlfU3Ybaj4ZKSscUjYqoCAEW Aby5/cxbqH6DyHhuk+9B92oPW+pp9hAHst6cchKeKDjs4ICU2AB9ik1dpDWSKps08VRufQulzgl EADDTXDkSUb0YiBxk= X-Received: by 2002:a17:906:b84b:b0:b76:7b85:f630 with SMTP id a640c23a62f3a-b767b8643d6mr1690789566b.34.1764249323762; Thu, 27 Nov 2025 05:15:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IEMRtlCIsA30Q3Q9nqlxVrWtGv5jSC0okVhGBo0adXnBdpvwoP7ymS6MsjuKU5ILAeWUBp3NA== X-Received: by 2002:a17:906:b84b:b0:b76:7b85:f630 with SMTP id a640c23a62f3a-b767b8643d6mr1690786966b.34.1764249323311; Thu, 27 Nov 2025 05:15:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 03/28] include: move memory_ldst* to include/system Date: Thu, 27 Nov 2025 14:14:50 +0100 Message-ID: <20251127131516.80807-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764252443902019200 Content-Type: text/plain; charset="utf-8" These partial headers are only included via system/memory.h, so keep them in the same directory. Signed-off-by: Paolo Bonzini --- include/system/memory.h | 14 +++++++------- include/{exec =3D> system}/memory_ldst.h.inc | 0 include/{exec =3D> system}/memory_ldst_cached.h.inc | 0 include/{exec =3D> system}/memory_ldst_phys.h.inc | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename include/{exec =3D> system}/memory_ldst.h.inc (100%) rename include/{exec =3D> system}/memory_ldst_cached.h.inc (100%) rename include/{exec =3D> system}/memory_ldst_phys.h.inc (100%) diff --git a/include/system/memory.h b/include/system/memory.h index 3bd5ffa5e0d..1cacc117cc6 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -2848,7 +2848,7 @@ MemTxResult address_space_write_rom(AddressSpace *as,= hwaddr addr, #define SUFFIX #define ARG1 as #define ARG1_DECL AddressSpace *as -#include "exec/memory_ldst.h.inc" +#include "system/memory_ldst.h.inc" =20 static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32= _t val) { @@ -2859,7 +2859,7 @@ static inline void stl_phys_notdirty(AddressSpace *as= , hwaddr addr, uint32_t val #define SUFFIX #define ARG1 as #define ARG1_DECL AddressSpace *as -#include "exec/memory_ldst_phys.h.inc" +#include "system/memory_ldst_phys.h.inc" =20 struct MemoryRegionCache { uint8_t *ptr; @@ -2897,7 +2897,7 @@ struct MemoryRegionCache { #define SUFFIX _cached_slow #define ARG1 cache #define ARG1_DECL MemoryRegionCache *cache -#include "exec/memory_ldst.h.inc" +#include "system/memory_ldst.h.inc" =20 /* Inline fast path for direct RAM access. */ static inline uint8_t address_space_ldub_cached(MemoryRegionCache *cache, @@ -2923,18 +2923,18 @@ static inline void address_space_stb_cached(MemoryR= egionCache *cache, } =20 #define ENDIANNESS -#include "exec/memory_ldst_cached.h.inc" +#include "system/memory_ldst_cached.h.inc" =20 #define ENDIANNESS _le -#include "exec/memory_ldst_cached.h.inc" +#include "system/memory_ldst_cached.h.inc" =20 #define ENDIANNESS _be -#include "exec/memory_ldst_cached.h.inc" +#include "system/memory_ldst_cached.h.inc" =20 #define SUFFIX _cached #define ARG1 cache #define ARG1_DECL MemoryRegionCache *cache -#include "exec/memory_ldst_phys.h.inc" +#include "system/memory_ldst_phys.h.inc" =20 /* address_space_cache_init: prepare for repeated access to a physical * memory region diff --git a/include/exec/memory_ldst.h.inc b/include/system/memory_ldst.h.= inc similarity index 100% rename from include/exec/memory_ldst.h.inc rename to include/system/memory_ldst.h.inc diff --git a/include/exec/memory_ldst_cached.h.inc b/include/system/memory_= ldst_cached.h.inc similarity index 100% rename from include/exec/memory_ldst_cached.h.inc rename to include/system/memory_ldst_cached.h.inc diff --git a/include/exec/memory_ldst_phys.h.inc b/include/system/memory_ld= st_phys.h.inc similarity index 100% rename from include/exec/memory_ldst_phys.h.inc rename to include/system/memory_ldst_phys.h.inc --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764251383; cv=none; d=zohomail.com; s=zohoarc; b=TCUmtS8qbbnXD/xm7AJGl2KB1ZJI6et4N4YyI6RQFQa+iSMRJ/C3Jt0Zr4LSSMdCAH0L0OBjZpJECx+P0vWs7nyX7bbmiEbCnLRlxcyTQRWabF5ouoElyYlc4PrpN5UMqMojZ6xadub9BHMy8pIUtCt395A4uTNL8WMG7XBb24A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764251383; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=A6ft6BELKhg3auDZcZUkYwIAm8CvB7eyb0vGAtNjiuo=; b=l5X3KYQIp7dwxHfyou1ppoFbz4hC7iXPpOxkIxdty1UkarAfdDMxDS0qf5cXF0rW32o5mY1HvVjU89ZaD7Ux/HgynecApr6UTP7KbUGR0iRK769V7W/7EYu/FQnez8QsyTTCxfUHQVKqk5DhO12WQfN4SCiOT11rHX8VreUpLsg= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764251383313902.9510529297664; Thu, 27 Nov 2025 05:49:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObqd-0002d9-Ch; Thu, 27 Nov 2025 08:15:47 -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 1vObqP-0002YP-Ck for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:33 -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 1vObqM-0001Bv-NV for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:33 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-696-xAmk1x-cO9ShRtCGTWgvHA-1; Thu, 27 Nov 2025 08:15:28 -0500 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-b7336ad128cso83581866b.1 for ; Thu, 27 Nov 2025 05:15:28 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f59a6a74sm161135666b.45.2025.11.27.05.15.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A6ft6BELKhg3auDZcZUkYwIAm8CvB7eyb0vGAtNjiuo=; b=HeTlAf3uy0A3SsB8P3pHZFGxKHBeefJPv1YDrRuNzJz+X4FhKub2u7LjuO3mWDzUh4jR0U olvhB9+9sfuB4grNiQlYkvP3PFrC+hTyt55anHsmaXVwnzLz8pB3qZ79AhljI5pj3PJYAC n1bKPMZutV1jKHA2SxrgcYU9IXAk0qY= X-MC-Unique: xAmk1x-cO9ShRtCGTWgvHA-1 X-Mimecast-MFC-AGG-ID: xAmk1x-cO9ShRtCGTWgvHA_1764249327 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249326; x=1764854126; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=A6ft6BELKhg3auDZcZUkYwIAm8CvB7eyb0vGAtNjiuo=; b=jfSg4DiDFKNwJ+HcZcfjesHk4SPRzV8DC89aLPz+zrBGCXlNqbm8rJLPCcQlsBGu/V 5f+RFatiUWMMYkfq5HKJ2wrcu9muxtoFi2y/pzQQ7KOUY5KRK0eYX5H/39/vqNb9snqD upBYefY8Wq0BzeL7iXwnlAUL0jubxWF3dTJkL4o75m4/g2gyS2ZAr+Ih1FuKHZBeBaWN oCzBWVuGP5UIrlDheDHWCG7IFGKA+XT0fAYNqs1N4x/bdgDQ1pzlRmd72tCrkOId2DRF RrEW2CxilE4eByW27lta2t12cM4AqYV6bCrrqb4a1Z9x5ljZvVU0BCo8vjPpZm87XzDf qK5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249326; x=1764854126; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=A6ft6BELKhg3auDZcZUkYwIAm8CvB7eyb0vGAtNjiuo=; b=wN7gfG1L/vNOiMu5TJXsm/o+DagLdD/1C2A5LlyDlJzZhT1nCOH1Pd64lRDYzJvYG0 zRKyp2dyfkIbe0eM8YslE1S5XmTkQXpbhbwM2lg7xfpxFFtsLxzVW0gVbPbrpduI3cir MMAMTgjygsOy5yJtDNkcY+LEgdc4h2H61lQAqj4xd2XbBgPqxsp0IcEC8KG7aoGkmRWF s3zv7w6mi8gS3X2goSyuK+LRVLlAHZjOGYy54iZUaQLlgdi8wFI6u8wxKF1yczZSSAzU iCOce4kdQpK1pkEP3k5BTlyUCGRxe7FbWv8TvNXYlvsiELfbzFNQZbHZkxCie8cVmiiS T68Q== X-Gm-Message-State: AOJu0YwJCE2OD+luLc8aozKSsesKw8p2ac0sgbTrxn8ihnIK4G6PtGpu LzojPej7NRE+j9q1zzFWaM5yg42BmCDcK6IFcF1fWhk5Sb4TyevficpsTTNpn+HE4EXmxzEwpIH nliTHfnRrt9fmr5VcHTMrJMY0YlOX4DZUONR2mmofmd4fPNZc7htooOvCyPGPye+UqsxBcIOY/H sFwRHqJVFT2ESYzCT0VVJQ9fGCR91DpYn5MaEix9Jl X-Gm-Gg: ASbGnctMeWdSlGe1aEBnz+RvlGp1Dcn1kTAj+Ox8PvhF6cl6FaR0JhDHFGJ3c7Ik3oj 2jIwTH+9d8cUlcV+aqKRkkb5ifMgLNBMpjFZ2RDt7hRrf8/2036QGhAjz8Eac8lKx6hVUNIPfMk InUJThwiUENhWKz/4vlp14mgkt0Vs2YrUSG60xsb6ntGqbtiTWjvELYpO06+bzOjJ6NnGd5P3ei xkCTCzleKwXU8V7MntPmqmdYhSxBDuRcwSdVtMpgFGC1B2U13LkNdo3SipXWPk5gQK0btGO86Nm 0bLQtgKmzFSWQFPdcE9ELBbrnL5D3TnOBitWIZDk6JumrPq5LNHK4Acp7T+aSx0MPVoWGFVuJqz oRiJUfCUMVtqgTMO9hS20OAUJMED534ih3PcLf7pGQUlC5V/U/bBLkHfRU9CQiEtRntndm0L8TZ JowDOW/G7aLqaxXYM= X-Received: by 2002:a17:907:26cd:b0:b76:4d0d:f2f8 with SMTP id a640c23a62f3a-b76c566bfc9mr1238727666b.57.1764249325973; Thu, 27 Nov 2025 05:15:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IEN4aDFNOnVAPyIxTeAvLzVy182s0wfD1X5ToJjDjRhzjsc7OVcRU4Ec+PuP8V1iN2ZleGP+A== X-Received: by 2002:a17:907:26cd:b0:b76:4d0d:f2f8 with SMTP id a640c23a62f3a-b76c566bfc9mr1238719166b.57.1764249325150; Thu, 27 Nov 2025 05:15:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 04/28] include: move hw/usb.h to hw/usb/ Date: Thu, 27 Nov 2025 14:14:51 +0100 Message-ID: <20251127131516.80807-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764251385191019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- MAINTAINERS | 2 +- hw/usb/hcd-dwc2.h | 2 +- hw/usb/hcd-ehci.h | 2 +- hw/usb/hcd-ohci.h | 2 +- hw/usb/hcd-uhci.h | 2 +- hw/usb/hcd-xhci-pci.h | 2 +- hw/usb/hcd-xhci-sysbus.h | 2 +- hw/usb/hcd-xhci.h | 2 +- include/hw/usb/msd.h | 2 +- include/hw/{ =3D> usb}/usb.h | 0 chardev/baum.c | 2 +- hw/arm/sbsa-ref.c | 2 +- hw/hppa/machine.c | 2 +- hw/i386/pc.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/mips/loongson3_virt.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/spapr.c | 2 +- hw/sh4/r2d.c | 2 +- hw/usb/bus-stub.c | 2 +- hw/usb/bus.c | 2 +- hw/usb/canokey.c | 2 +- hw/usb/combined-packet.c | 2 +- hw/usb/core.c | 2 +- hw/usb/desc-msos.c | 2 +- hw/usb/desc.c | 2 +- hw/usb/dev-audio.c | 2 +- hw/usb/dev-hid.c | 2 +- hw/usb/dev-hub.c | 2 +- hw/usb/dev-mtp.c | 2 +- hw/usb/dev-network.c | 2 +- hw/usb/dev-serial.c | 2 +- hw/usb/dev-smartcard-reader.c | 2 +- hw/usb/dev-storage-bot.c | 2 +- hw/usb/dev-storage-classic.c | 2 +- hw/usb/dev-storage.c | 2 +- hw/usb/dev-uas.c | 2 +- hw/usb/dev-wacom.c | 2 +- hw/usb/hcd-ohci-pci.c | 2 +- hw/usb/hcd-ohci-sysbus.c | 2 +- hw/usb/hcd-ohci.c | 2 +- hw/usb/hcd-uhci.c | 2 +- hw/usb/hcd-xhci-nec.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/usb/libhw.c | 2 +- hw/usb/pcap.c | 2 +- hw/usb/quirks.c | 2 +- hw/usb/redirect.c | 2 +- hw/usb/u2f-emulated.c | 2 +- hw/usb/u2f-passthru.c | 2 +- hw/usb/u2f.c | 2 +- hw/usb/xen-usb.c | 2 +- hw/vmapple/vmapple.c | 2 +- system/vl.c | 2 +- 55 files changed, 54 insertions(+), 54 deletions(-) rename include/hw/{ =3D> usb}/usb.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index d007584b476..10f74e97fa4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2285,7 +2285,7 @@ S: Orphan F: hw/usb/* F: tests/qtest/usb-*-test.c F: docs/system/devices/usb.rst -F: include/hw/usb.h +F: include/hw/usb/usb.h F: include/hw/usb/ =20 USB (serial adapter) diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h index 2d5a5690fc2..0c02392ade0 100644 --- a/hw/usb/hcd-dwc2.h +++ b/hw/usb/hcd-dwc2.h @@ -22,7 +22,7 @@ #include "qemu/timer.h" #include "hw/irq.h" #include "hw/sysbus.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "system/dma.h" #include "qom/object.h" =20 diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index ffd6c5108eb..c16717294d3 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -19,7 +19,7 @@ #define HW_USB_HCD_EHCI_H =20 #include "qemu/timer.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "system/dma.h" #include "hw/pci/pci_device.h" #include "hw/sysbus.h" diff --git a/hw/usb/hcd-ohci.h b/hw/usb/hcd-ohci.h index 3cc35a5cdc5..75e266de90b 100644 --- a/hw/usb/hcd-ohci.h +++ b/hw/usb/hcd-ohci.h @@ -23,7 +23,7 @@ =20 #include "hw/sysbus.h" #include "system/dma.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "qom/object.h" =20 /* Number of Downstream Ports on the root hub: */ diff --git a/hw/usb/hcd-uhci.h b/hw/usb/hcd-uhci.h index e0a6525505c..3154837f1d1 100644 --- a/hw/usb/hcd-uhci.h +++ b/hw/usb/hcd-uhci.h @@ -31,7 +31,7 @@ #include "system/memory.h" #include "qemu/timer.h" #include "hw/pci/pci_device.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" =20 typedef struct UHCIQueue UHCIQueue; =20 diff --git a/hw/usb/hcd-xhci-pci.h b/hw/usb/hcd-xhci-pci.h index 5b61ae84555..c9359f1bd90 100644 --- a/hw/usb/hcd-xhci-pci.h +++ b/hw/usb/hcd-xhci-pci.h @@ -25,7 +25,7 @@ #define HW_USB_HCD_XHCI_PCI_H =20 #include "hw/pci/pci_device.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hcd-xhci.h" =20 #define TYPE_XHCI_PCI "pci-xhci" diff --git a/hw/usb/hcd-xhci-sysbus.h b/hw/usb/hcd-xhci-sysbus.h index fdfcbbee3bf..f8175470bab 100644 --- a/hw/usb/hcd-xhci-sysbus.h +++ b/hw/usb/hcd-xhci-sysbus.h @@ -11,7 +11,7 @@ #ifndef HW_USB_HCD_XHCI_SYSBUS_H #define HW_USB_HCD_XHCI_SYSBUS_H =20 -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hcd-xhci.h" #include "hw/sysbus.h" =20 diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h index 9c3974f1489..5cb9e06d1d6 100644 --- a/hw/usb/hcd-xhci.h +++ b/hw/usb/hcd-xhci.h @@ -23,7 +23,7 @@ #define HW_USB_HCD_XHCI_H #include "qom/object.h" =20 -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/usb/xhci.h" #include "system/dma.h" =20 diff --git a/include/hw/usb/msd.h b/include/hw/usb/msd.h index f9fd862b529..125d2c218f6 100644 --- a/include/hw/usb/msd.h +++ b/include/hw/usb/msd.h @@ -7,7 +7,7 @@ * This code is licensed under the LGPL. */ =20 -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/scsi/scsi.h" =20 enum USBMSDMode { diff --git a/include/hw/usb.h b/include/hw/usb/usb.h similarity index 100% rename from include/hw/usb.h rename to include/hw/usb/usb.h diff --git a/chardev/baum.c b/chardev/baum.c index ad683215041..157f8b95195 100644 --- a/chardev/baum.c +++ b/chardev/baum.c @@ -28,7 +28,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/timer.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "ui/console.h" #include #include diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 2205500a8da..3ba69d37d79 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -45,7 +45,7 @@ #include "hw/loader.h" #include "hw/pci-host/gpex.h" #include "hw/qdev-properties.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/usb/xhci.h" #include "hw/char/pl011.h" #include "hw/watchdog/sbsa_gwdt.h" diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 8c66eed5a26..acd1c3f005b 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -24,7 +24,7 @@ #include "hw/input/lasips2.h" #include "hw/net/lasi_82596.h" #include "hw/nmi.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/pci/pci.h" #include "hw/pci/pci_device.h" #include "hw/pci-host/astro.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f8b919cb6c4..0f2a5889022 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -52,7 +52,7 @@ #include "acpi-build.h" #include "hw/mem/nvdimm.h" #include "hw/cxl/cxl_host.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/i386/intel_iommu.h" #include "hw/net/ne2000-isa.h" #include "hw/virtio/virtio-iommu.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 7b3611e973c..f6b9a1bc406 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -35,7 +35,7 @@ #include "hw/display/ramfb.h" #include "hw/pci/pci.h" #include "hw/pci/pci_ids.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "net/net.h" #include "hw/ide/pci.h" #include "hw/irq.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 6015e639d7b..02de7453baa 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -52,7 +52,7 @@ #include "hw/ide/ahci-pci.h" #include "hw/intc/ioapic.h" #include "hw/southbridge/ich9.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/usb/hcd-uhci.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index 77dc895648f..4df6cf13b36 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -43,7 +43,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/pci-host/gpex.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "net/net.h" #include "system/kvm.h" #include "system/qtest.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 951de4bae4b..739f1af3e18 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -72,7 +72,7 @@ #include "system/kvm.h" #include "system/reset.h" #include "kvm_ppc.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/sysbus.h" #include "trace.h" =20 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 99b843ba2fa..6f2d10330d6 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -78,7 +78,7 @@ #include "hw/virtio/vhost-scsi-common.h" =20 #include "system/confidential-guest-support.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "trace.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 010be6d5394..c29ee690690 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -41,7 +41,7 @@ #include "hw/ide/mmio.h" #include "hw/irq.h" #include "hw/loader.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/block/flash.h" #include "exec/tswap.h" =20 diff --git a/hw/usb/bus-stub.c b/hw/usb/bus-stub.c index cd0c317b718..a7c3909e967 100644 --- a/hw/usb/bus-stub.c +++ b/hw/usb/bus-stub.c @@ -12,7 +12,7 @@ #include "qapi/qapi-commands-machine.h" #include "system/system.h" #include "monitor/monitor.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" =20 USBDevice *usbdevice_create(const char *driver) { diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 8dd2ce415eb..887a4a2e487 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" #include "hw/qdev-properties.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" #include "qapi/type-helpers.h" diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c index cbefbb5daf8..acd4ea30d98 100644 --- a/hw/usb/canokey.c +++ b/hw/usb/canokey.c @@ -12,7 +12,7 @@ =20 #include "qemu/module.h" #include "qapi/error.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/qdev-properties.h" #include "trace.h" #include "desc.h" diff --git a/hw/usb/combined-packet.c b/hw/usb/combined-packet.c index e56802f89a3..f18e53b7885 100644 --- a/hw/usb/combined-packet.c +++ b/hw/usb/combined-packet.c @@ -21,7 +21,7 @@ */ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "qemu/iov.h" #include "trace.h" =20 diff --git a/hw/usb/core.c b/hw/usb/core.c index 975f76250a1..b3f811c513b 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -24,7 +24,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "qemu/iov.h" #include "trace.h" =20 diff --git a/hw/usb/desc-msos.c b/hw/usb/desc-msos.c index c72c65b650c..3f53d4943d2 100644 --- a/hw/usb/desc-msos.c +++ b/hw/usb/desc-msos.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "desc.h" =20 /* diff --git a/hw/usb/desc.c b/hw/usb/desc.c index f2bdc05a953..268eaf06994 100644 --- a/hw/usb/desc.c +++ b/hw/usb/desc.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" =20 -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "desc.h" #include "trace.h" =20 diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index 8dd9d265996..988824ea750 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -32,7 +32,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "hw/qdev-properties.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" #include "qemu/audio.h" diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 96623aa3223..296e9d0d856 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "ui/console.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" #include "qapi/error.h" diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index a19350d9c42..f418da14094 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -27,7 +27,7 @@ #include "qemu/timer.h" #include "trace.h" #include "hw/qdev-properties.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" #include "qemu/error-report.h" diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index afd7944b737..04e8eedbf61 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -23,7 +23,7 @@ #include "qemu/filemonitor.h" #include "trace.h" #include "hw/qdev-properties.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" #include "qemu/units.h" diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 1df24541814..34cd906d6cc 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/qdev-properties.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" #include "net/net.h" diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 2eb52b2e01e..17bdff9e820 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -15,7 +15,7 @@ #include "qemu/module.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" #include "chardev/char-serial.h" diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 6ce7154feed..a1081e545aa 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -41,7 +41,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/qdev-properties.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" =20 diff --git a/hw/usb/dev-storage-bot.c b/hw/usb/dev-storage-bot.c index df6ab7f656b..a7f8d80c17a 100644 --- a/hw/usb/dev-storage-bot.c +++ b/hw/usb/dev-storage-bot.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/usb/desc.h" #include "hw/usb/msd.h" =20 diff --git a/hw/usb/dev-storage-classic.c b/hw/usb/dev-storage-classic.c index dabe1563593..977151c4a08 100644 --- a/hw/usb/dev-storage-classic.c +++ b/hw/usb/dev-storage-classic.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/usb/desc.h" #include "hw/usb/msd.h" #include "system/system.h" diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index b13fe345c45..bbd97406f00 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -13,7 +13,7 @@ #include "qemu/module.h" #include "qemu/option.h" #include "qemu/config-file.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/usb/msd.h" #include "desc.h" #include "hw/qdev-properties.h" diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 18ebe15d0c4..75f01c74038 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -18,7 +18,7 @@ #include "qemu/module.h" #include "qemu/log.h" =20 -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" #include "hw/qdev-properties.h" diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c index f4b71a21472..14d07e81281 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -28,7 +28,7 @@ =20 #include "qemu/osdep.h" #include "ui/console.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/usb/hid.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index 94d1077eb9e..e180e96b5f1 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/timer.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/vmstate.h" #include "hw/pci/pci_device.h" #include "hw/sysbus.h" diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c index 3fc6cce44b0..2d3c770b117 100644 --- a/hw/usb/hcd-ohci-sysbus.c +++ b/hw/usb/hcd-ohci-sysbus.c @@ -23,7 +23,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/qdev-dma.h" diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 72a9f9f4749..c48f07f7e39 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -30,7 +30,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/qdev-dma.h" diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index e207d0587a1..124ac4faec0 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -27,7 +27,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/usb/uhci-regs.h" #include "migration/vmstate.h" #include "hw/pci/pci.h" diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c index 9e0fea26f40..5fc853eb330 100644 --- a/hw/usb/hcd-xhci-nec.c +++ b/hw/usb/hcd-xhci-nec.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "qemu/module.h" #include "hw/pci/pci.h" #include "hw/qdev-properties.h" diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index b74670ae256..38893b5e680 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -56,7 +56,7 @@ #include "trace.h" =20 #include "hw/qdev-properties.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" =20 /* -----------------------------------------------------------------------= - */ =20 diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c index 4f03ef4ba9a..e108be054c9 100644 --- a/hw/usb/libhw.c +++ b/hw/usb/libhw.c @@ -20,7 +20,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "system/dma.h" =20 int usb_packet_map(USBPacket *p, QEMUSGList *sgl) diff --git a/hw/usb/pcap.c b/hw/usb/pcap.c index dbff00be252..bb74d046a59 100644 --- a/hw/usb/pcap.c +++ b/hw/usb/pcap.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" =20 #define PCAP_MAGIC 0xa1b2c3d4 #define PCAP_MAJOR 2 diff --git a/hw/usb/quirks.c b/hw/usb/quirks.c index 23ea7a23ea1..44007f8de7a 100644 --- a/hw/usb/quirks.c +++ b/hw/usb/quirks.c @@ -14,7 +14,7 @@ =20 #include "qemu/osdep.h" #include "quirks.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" =20 static bool usb_id_match(const struct usb_device_id *ids, uint16_t vendor_id, uint16_t product_id, diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index d603a4a6f96..1a73db68f26 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -43,7 +43,7 @@ =20 #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/usb/u2f-emulated.c b/hw/usb/u2f-emulated.c index ace5eceadd9..783e7f1af0b 100644 --- a/hw/usb/u2f-emulated.c +++ b/hw/usb/u2f-emulated.c @@ -28,7 +28,7 @@ #include "qemu/thread.h" #include "qemu/main-loop.h" #include "qapi/error.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/qdev-properties.h" =20 #include diff --git a/hw/usb/u2f-passthru.c b/hw/usb/u2f-passthru.c index fa8d9cdda89..b3206fb7fe4 100644 --- a/hw/usb/u2f-passthru.c +++ b/hw/usb/u2f-passthru.c @@ -29,7 +29,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/qdev-properties.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "migration/vmstate.h" =20 #include "u2f.h" diff --git a/hw/usb/u2f.c b/hw/usb/u2f.c index b051a999d3a..d6291852f63 100644 --- a/hw/usb/u2f.c +++ b/hw/usb/u2f.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/usb/hid.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index fa46a7da01c..caf9efbb77c 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -26,7 +26,7 @@ #include "qemu/config-file.h" #include "qemu/main-loop.h" #include "qemu/option.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/xen/xen-legacy-backend.h" #include "monitor/qdev.h" #include "qapi/error.h" diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index f3cff329244..62d33525bab 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -30,7 +30,7 @@ #include "hw/loader.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" #include "hw/char/pl011.h" diff --git a/system/vl.c b/system/vl.c index 5091fe52d92..cdf32c119b2 100644 --- a/system/vl.c +++ b/system/vl.c @@ -54,7 +54,7 @@ #include "qemu/accel.h" #include "qemu/async-teardown.h" #include "qemu/exit-with-parent.h" -#include "hw/usb.h" +#include "hw/usb/usb.h" #include "hw/isa/isa.h" #include "hw/scsi/scsi.h" #include "hw/sd/sd.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764251382; cv=none; d=zohomail.com; s=zohoarc; b=HBBOuOwuqANIa/dqmxJBAD01+xSY4AJZ4HLjIAlcY1nIKXZ/PvDB6YXG51T7OI/O8YsdG8laEbBW7LCfhiVQj03NRBfVNJwnHsw+57vSPhJyxmrwnHom7GdLewDtKmTWskTNofmqg5aZ58ouHaglaR41rLfA4B8+yA/fSvy8f5s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764251382; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=K8xE7C50uep1HO0OGrq08ca9egkIaGRyDMovXvqDJDg=; b=Q5TBXBlIijr6dvqaroCGMj9Ra4C27U1S2BetTT2GVvS/y0dJ3c6yqKX/2hQZZQOwwfQ/0mIoVWToyLQGJbiy8z2x6zl9xZeScZfDTkrDRJ2+FjqG+QPoEhLP/1H/ch7s9LUmcdm5LGofNp9a3P+Xlr1euGY+nCjzJd/TOJ0JW84= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764251382129694.9534200871344; Thu, 27 Nov 2025 05:49:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObqd-0002cu-8H; Thu, 27 Nov 2025 08:15:47 -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 1vObqY-0002a9-BD for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:43 -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 1vObqT-0001DI-3R for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:42 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-382-2Y5JlkvFNEShsO2U51CHBw-1; Thu, 27 Nov 2025 08:15:33 -0500 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-b71043a0e4fso81253166b.2 for ; Thu, 27 Nov 2025 05:15:33 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f59a6a67sm156665766b.34.2025.11.27.05.15.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K8xE7C50uep1HO0OGrq08ca9egkIaGRyDMovXvqDJDg=; b=Y+qabNWW9N5EeZ4kNwQsW+IZCXbdwoeF0WawZm+NKwahUb/99f5AHuPOSUuS0G1HLpNbLX RaTKIJOaQ0E+ecTcq3rQeAph+mEC7UcfD4Cpe4Nf6L9eIGRn1TNRL3w7SIMEo6xrz2AEm2 5f92M2Xbb8NJ81+uYUPRZG7l0GW7tYM= X-MC-Unique: 2Y5JlkvFNEShsO2U51CHBw-1 X-Mimecast-MFC-AGG-ID: 2Y5JlkvFNEShsO2U51CHBw_1764249332 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249331; x=1764854131; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=K8xE7C50uep1HO0OGrq08ca9egkIaGRyDMovXvqDJDg=; b=BaGkEjVGZ9xNUK1T/Xxp6Br8PniF8IYxy7DW3DJhLUtc62CH7iy9RB3XD6fJ0zp3VS JkpRxdeBzYqOtPj5IEn/yziBjOmQV8NIlf9eMForlQS9wEV6m4z8ABEcKj1vkZDXeI0N 7AfRqceMJnUQEEYVZcqUCNGFGqCiaIZY+HdeNbcD8AFn36wPOHawJaJ6usZQB++biUhm Kt9I63/0ApKYbLqLdjF9oxJZf4QPw0FhgKp8WyWvq97RD6QW9+YgoX25fKVZRPOA8t6I Ex09qVcy2WFHshUyZPPVzhacQQMjFp8qhBEIyJIJhbS/SX6Nvd/N5jyJtg/I2WqGi9wz +FPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249331; x=1764854131; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=K8xE7C50uep1HO0OGrq08ca9egkIaGRyDMovXvqDJDg=; b=dA2YnymUDI4qjxRAnfhZ+Ll7dgZu75LTDYV5/oGqclI3cLYSpTNiDhAjEimBRGHfov HPnVa9l0N8U8vq140gXao29qXPM/j9Wt6IkUObweON10OK49hPIpsAhDNG2VMYMf4NMy VO0Rhonvx3ifgFdtjpfsWd1eoHgxhjXtmWGNuyCm2k+40ODS98yk5hv/nXcV+sof4EHy 3zblErQsP+qmjPtPu9zI5pQPpnNMYXWOd//W6H6WFar1B/yCCJExgfnrEzNbhfIumuF1 O4tu2lZ+pdSkk5XONdb+hFEGSi2GGFT2zO+SZ8jkI6aBhxEo6ImzkK2cvHFd8v4NHGzC Ryqw== X-Gm-Message-State: AOJu0YwagtvjVqF0NZVdrkKVQb3gbdf+iQW4yhzUuhj0WQbpOstu1py/ j41KL6JjtQa0+QAjr7J8/EP1CN9fXI03AfP2fvT95d5fgQrJ/BDBIRJeakB/XrjXcVj9o2Or67V CVhVUPM80OSsa9c9OEK3i0qGa9pFBSVwZpukuWjgbJr79xreH00wc9ByGwOyzMrY94ZhSvxvQLp 3uCzAUH0u8n9nfZLCDH8qxm1Sxe2ZR1kP5dFtTUHws X-Gm-Gg: ASbGncutzdfS/vvB9ycn64KLFX2hFiIRcudDEwJDhUBFryrfmYzghL6eaHx9u+s5uvl OpUH4IrfS1xSP02RxQH4F1H0iE2ajCm1ZA9HGaDIljZUcoTlqEN5yz1O0J0HQflDFMSfDdDNsUo SQ6xUv2q0Ag7i+aS736THzV2Pp3LVFukXIhU4VGspTltz+j36fYaC/UqcC9b7w8UR/WGDCkqkIi D459kxkNniLS/vRMHgLJbTUNb7KTkt18HgE9nUVgdhrUllYgFaKd9gTE3ih0GlN8PHN7uhFdJYs 5hUgB4aKXoHYeV9dym50MM6bvziSRLfho7dEwbgiliapUIvyMiFLJA9QVx3uuHhdyhAMqMaJpV6 4mgv8dl/r2fL1UOCUKq7Qyh3FaWoEtFgs2HsTBAly/DU7KnOrO91ovJwY1YNriQ8TNXO1wWJ6Im rhgHfQEi6S3CUJbMY= X-Received: by 2002:a17:907:60cd:b0:b73:5f5e:574d with SMTP id a640c23a62f3a-b76718ab1e0mr2378573366b.59.1764249329640; Thu, 27 Nov 2025 05:15:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IGYkGbY3iGyikUWFXAEc6wDE2OeFjkk9+tMqBUVV5duW8cRLtDx60WxKeuMUO74wUBn50Ro/g== X-Received: by 2002:a17:907:60cd:b0:b73:5f5e:574d with SMTP id a640c23a62f3a-b76718ab1e0mr2378555066b.59.1764249326816; Thu, 27 Nov 2025 05:15:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 05/28] include: move hw/boards.h to hw/core/ Date: Thu, 27 Nov 2025 14:14:52 +0100 Message-ID: <20251127131516.80807-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764251383237019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- MAINTAINERS | 2 +- docs/conf.py | 2 +- hw/alpha/alpha_sys.h | 2 +- hw/avr/boot.h | 2 +- hw/i386/acpi-common.h | 2 +- hw/i386/fw_cfg.h | 2 +- hw/loongarch/fw_cfg.h | 2 +- hw/mips/fw_cfg.h | 2 +- hw/ppc/e500.h | 2 +- include/hw/acpi/cpu.h | 2 +- include/hw/arm/aspeed.h | 2 +- include/hw/arm/machines-qom.h | 2 +- include/hw/arm/npcm7xx.h | 2 +- include/hw/arm/raspi_platform.h | 2 +- include/hw/arm/virt.h | 2 +- include/hw/{ =3D> core}/boards.h | 0 include/hw/cxl/cxl_host.h | 2 +- include/hw/i386/microvm.h | 2 +- include/hw/i386/pc.h | 2 +- include/hw/i386/x86.h | 2 +- include/hw/loongarch/virt.h | 2 +- include/hw/m68k/q800.h | 2 +- include/hw/misc/lasi.h | 2 +- include/hw/openrisc/boot.h | 2 +- include/hw/ppc/pnv.h | 2 +- include/hw/ppc/spapr.h | 2 +- include/hw/ppc/spapr_numa.h | 2 +- include/hw/remote/machine.h | 2 +- include/hw/riscv/microchip_pfsoc.h | 2 +- include/hw/riscv/numa.h | 2 +- include/hw/riscv/opentitan.h | 2 +- include/hw/riscv/shakti_c.h | 2 +- include/hw/riscv/sifive_e.h | 2 +- include/hw/riscv/sifive_u.h | 2 +- include/hw/riscv/spike.h | 2 +- include/hw/riscv/virt.h | 2 +- include/hw/riscv/xiangshan_kmh.h | 2 +- include/hw/s390x/cpu-topology.h | 2 +- include/hw/s390x/s390-virtio-ccw.h | 2 +- include/hw/tricore/triboard.h | 2 +- include/hw/xen/xen-pvh-common.h | 2 +- include/system/kvm_int.h | 2 +- accel/accel-system.c | 2 +- accel/hvf/hvf-all.c | 2 +- accel/kvm/kvm-all.c | 2 +- accel/mshv/mshv-all.c | 2 +- accel/tcg/tcg-accel-ops-mttcg.c | 2 +- accel/tcg/tcg-all.c | 2 +- accel/xen/xen-all.c | 2 +- backends/hostmem.c | 2 +- block/monitor/block-hmp-cmds.c | 2 +- gdbstub/gdbstub.c | 2 +- gdbstub/system.c | 2 +- hw/acpi/aml-build.c | 2 +- hw/acpi/memory_hotplug.c | 2 +- hw/acpi/pci.c | 2 +- hw/arm/allwinner-a10.c | 2 +- hw/arm/allwinner-r40.c | 2 +- hw/arm/aspeed_ast27x0-fc.c | 2 +- hw/arm/b-l475e-iot01a.c | 2 +- hw/arm/bananapi_m2u.c | 2 +- hw/arm/boot.c | 2 +- hw/arm/collie.c | 2 +- hw/arm/cubieboard.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4_boards.c | 2 +- hw/arm/fby35.c | 2 +- hw/arm/fsl-imx6.c | 2 +- hw/arm/fsl-imx6ul.c | 2 +- hw/arm/fsl-imx7.c | 2 +- hw/arm/fsl-imx8mp.c | 2 +- hw/arm/highbank.c | 2 +- hw/arm/imx25_pdk.c | 2 +- hw/arm/imx8mp-evk.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/max78000fthr.c | 2 +- hw/arm/mcimx6ul-evk.c | 2 +- hw/arm/mcimx7d-sabre.c | 2 +- hw/arm/microbit.c | 2 +- hw/arm/mps2-tz.c | 2 +- hw/arm/mps2.c | 2 +- hw/arm/mps3r.c | 2 +- hw/arm/msf2-som.c | 2 +- hw/arm/musca.c | 2 +- hw/arm/musicpal.c | 2 +- hw/arm/netduino2.c | 2 +- hw/arm/netduinoplus2.c | 2 +- hw/arm/npcm8xx.c | 2 +- hw/arm/npcm8xx_boards.c | 2 +- hw/arm/olimex-stm32-h405.c | 2 +- hw/arm/omap_sx1.c | 2 +- hw/arm/orangepi.c | 2 +- hw/arm/raspi.c | 2 +- hw/arm/raspi4b.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/sabrelite.c | 2 +- hw/arm/sbsa-ref.c | 2 +- hw/arm/stellaris.c | 2 +- hw/arm/stm32vldiscovery.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 2 +- hw/arm/xen-pvh.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/xlnx-versal-virt.c | 2 +- hw/arm/xlnx-zcu102.c | 2 +- hw/arm/xlnx-zynqmp.c | 2 +- hw/core/cpu-common.c | 2 +- hw/core/generic-loader.c | 2 +- hw/core/guest-loader.c | 2 +- hw/core/loader.c | 2 +- hw/core/machine-hmp-cmds.c | 2 +- hw/core/machine-qmp-cmds.c | 2 +- hw/core/machine-smp.c | 2 +- hw/core/machine.c | 2 +- hw/core/null-machine.c | 2 +- hw/core/numa.c | 2 +- hw/core/qdev-hotplug.c | 2 +- hw/core/qdev.c | 2 +- hw/cpu/core.c | 2 +- hw/cxl/cxl-host.c | 2 +- hw/hyperv/hv-balloon.c | 2 +- hw/i2c/pm_smbus.c | 2 +- hw/i2c/smbus_eeprom.c | 2 +- hw/i386/vapic.c | 2 +- hw/i386/vmport.c | 2 +- hw/i386/xen/xen-pvh.c | 2 +- hw/intc/apic_common.c | 2 +- hw/intc/loongarch_ipi.c | 2 +- hw/intc/loongarch_pic_kvm.c | 2 +- hw/intc/riscv_aplic.c | 2 +- hw/intc/riscv_imsic.c | 2 +- hw/loongarch/virt.c | 2 +- hw/m68k/an5206.c | 2 +- hw/m68k/mcf5206.c | 2 +- hw/m68k/mcf5208.c | 2 +- hw/m68k/next-cube.c | 2 +- hw/m68k/q800-glue.c | 2 +- hw/m68k/q800.c | 2 +- hw/m68k/virt.c | 2 +- hw/mem/memory-device.c | 2 +- hw/mem/pc-dimm.c | 2 +- hw/microblaze/boot.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/microblaze/xlnx-zynqmp-pmu.c | 2 +- hw/mips/boston.c | 2 +- hw/mips/fuloong2e.c | 2 +- hw/mips/jazz.c | 2 +- hw/mips/malta.c | 2 +- hw/nvram/fw_cfg.c | 2 +- hw/openrisc/openrisc_sim.c | 2 +- hw/openrisc/virt.c | 2 +- hw/pci-bridge/pci_expander_bridge.c | 2 +- hw/pci/pci.c | 2 +- hw/ppc/amigaone.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/pegasos.c | 2 +- hw/ppc/ppc440_bamboo.c | 2 +- hw/ppc/ppe42_machine.c | 2 +- hw/ppc/prep.c | 2 +- hw/ppc/sam460ex.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/remote/vfio-user-obj.c | 2 +- hw/riscv/boot.c | 2 +- hw/riscv/microblaze-v-generic.c | 2 +- hw/riscv/microchip_pfsoc.c | 2 +- hw/riscv/numa.c | 2 +- hw/riscv/opentitan.c | 2 +- hw/riscv/shakti_c.c | 2 +- hw/riscv/sifive_e.c | 2 +- hw/riscv/sifive_u.c | 2 +- hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 2 +- hw/riscv/xiangshan_kmh.c | 2 +- hw/rx/rx-gdbsim.c | 2 +- hw/s390x/cpu-topology.c | 2 +- hw/s390x/ipl.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/s390-pci-inst.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/sclp.c | 2 +- hw/sh4/r2d.c | 2 +- hw/smbios/smbios.c | 2 +- hw/sparc/leon3.c | 2 +- hw/sparc/sun4m.c | 2 +- hw/sparc64/niagara.c | 2 +- hw/sparc64/sparc64.c | 2 +- hw/sparc64/sun4u.c | 2 +- hw/tricore/tricore_testboard.c | 2 +- hw/uefi/ovmf-log.c | 2 +- hw/vfio/igd.c | 2 +- hw/virtio/virtio-balloon.c | 2 +- hw/virtio/virtio-iommu-pci.c | 2 +- hw/virtio/virtio-mem.c | 2 +- hw/virtio/virtio-pci.c | 2 +- hw/vmapple/vmapple.c | 2 +- hw/xen/xen-hvm-common.c | 2 +- hw/xen/xen-legacy-backend.c | 2 +- hw/xen/xen-pvh-common.c | 2 +- hw/xenpv/xen_machine_pv.c | 2 +- hw/xtensa/sim.c | 2 +- hw/xtensa/virt.c | 2 +- hw/xtensa/xtfpga.c | 2 +- migration/migration.c | 2 +- migration/postcopy-ram.c | 2 +- migration/ram.c | 2 +- migration/savevm.c | 2 +- monitor/qemu-config-qmp.c | 2 +- plugins/api-system.c | 2 +- plugins/system.c | 2 +- semihosting/arm-compat-semi.c | 2 +- system/bootdevice.c | 2 +- system/cpus.c | 2 +- system/device_tree.c | 2 +- system/dirtylimit.c | 2 +- system/memory.c | 2 +- system/physmem.c | 2 +- system/qdev-monitor.c | 2 +- system/runstate.c | 2 +- target-info-stub.c | 2 +- target/arm/arm-qmp-cmds.c | 2 +- target/arm/cpu.c | 2 +- target/arm/hvf/hvf.c | 2 +- target/arm/kvm.c | 2 +- target/arm/tcg/cpu32.c | 2 +- target/i386/cpu.c | 2 +- target/i386/hvf/hvf-cpu.c | 2 +- target/i386/kvm/kvm-cpu.c | 2 +- target/i386/kvm/vmsr_energy.c | 2 +- target/i386/whpx/whpx-all.c | 2 +- target/loongarch/kvm/kvm.c | 2 +- target/m68k/m68k-semi.c | 2 +- target/mips/kvm.c | 2 +- target/openrisc/sys_helper.c | 2 +- target/ppc/cpu_init.c | 2 +- target/riscv/kvm/kvm-cpu.c | 2 +- target/riscv/tcg/tcg-cpu.c | 2 +- target/s390x/cpu-system.c | 2 +- target/s390x/mmu_helper.c | 2 +- target/s390x/sigp.c | 2 +- target/s390x/tcg/excp_helper.c | 2 +- target/s390x/tcg/mem_helper.c | 2 +- target/s390x/tcg/misc_helper.c | 2 +- tests/qtest/fuzz/generic_fuzz.c | 2 +- tests/unit/test-smp-parse.c | 2 +- scripts/compare-machine-types.py | 2 +- 248 files changed, 247 insertions(+), 247 deletions(-) rename include/hw/{ =3D> core}/boards.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 10f74e97fa4..4c3cfbc81a4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1994,7 +1994,7 @@ F: hw/core/numa.c F: hw/cpu/cluster.c F: qapi/machine.json F: qapi/machine-common.json -F: include/hw/boards.h +F: include/hw/core/boards.h F: include/hw/core/cpu.h F: include/hw/cpu/cluster.h F: include/system/numa.h diff --git a/docs/conf.py b/docs/conf.py index 0c9ec74097f..bc4e9622dc8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -136,7 +136,7 @@ =20 # These thresholds must match the constants # MACHINE_VER_DELETION_MAJOR & MACHINE_VER_DEPRECATION_MAJOR -# defined in include/hw/boards.h and the introductory text in +# defined in include/hw/core/boards.h and the introductory text in # docs/about/deprecated.rst ver_machine_deprecation_version =3D "%d.%d.0" % (major - 3, minor) ver_machine_deletion_version =3D "%d.%d.0" % (major - 6, minor) diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h index a303c584383..6e6691d116a 100644 --- a/hw/alpha/alpha_sys.h +++ b/hw/alpha/alpha_sys.h @@ -5,7 +5,7 @@ =20 #include "target/alpha/cpu-qom.h" #include "hw/pci/pci.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/intc/i8259.h" =20 =20 diff --git a/hw/avr/boot.h b/hw/avr/boot.h index 684d553322b..9eed2055591 100644 --- a/hw/avr/boot.h +++ b/hw/avr/boot.h @@ -11,7 +11,7 @@ #ifndef HW_AVR_BOOT_H #define HW_AVR_BOOT_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "cpu.h" =20 /** diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h index e305aaac158..57ef024cd37 100644 --- a/hw/i386/acpi-common.h +++ b/hw/i386/acpi-common.h @@ -1,7 +1,7 @@ #ifndef HW_I386_ACPI_COMMON_H #define HW_I386_ACPI_COMMON_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/acpi/bios-linker-loader.h" #include "hw/i386/x86.h" =20 diff --git a/hw/i386/fw_cfg.h b/hw/i386/fw_cfg.h index e560fd7be82..e7e70ff2373 100644 --- a/hw/i386/fw_cfg.h +++ b/hw/i386/fw_cfg.h @@ -9,7 +9,7 @@ #ifndef HW_I386_FW_CFG_H #define HW_I386_FW_CFG_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i386/pc.h" #include "hw/nvram/fw_cfg.h" =20 diff --git a/hw/loongarch/fw_cfg.h b/hw/loongarch/fw_cfg.h index 27ee68286ed..809b06c545e 100644 --- a/hw/loongarch/fw_cfg.h +++ b/hw/loongarch/fw_cfg.h @@ -8,7 +8,7 @@ #ifndef HW_LOONGARCH_FW_CFG_H #define HW_LOONGARCH_FW_CFG_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/nvram/fw_cfg.h" =20 FWCfgState *virt_fw_cfg_init(ram_addr_t ram_size, MachineState *ms); diff --git a/hw/mips/fw_cfg.h b/hw/mips/fw_cfg.h index e317d5b9a3e..8a42d98cdf5 100644 --- a/hw/mips/fw_cfg.h +++ b/hw/mips/fw_cfg.h @@ -9,7 +9,7 @@ #ifndef HW_MIPS_FW_CFG_H #define HW_MIPS_FW_CFG_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/nvram/fw_cfg.h" =20 /* Data for BIOS to identify machine */ diff --git a/hw/ppc/e500.h b/hw/ppc/e500.h index 00f490519c2..cda539bda18 100644 --- a/hw/ppc/e500.h +++ b/hw/ppc/e500.h @@ -1,7 +1,7 @@ #ifndef PPCE500_H #define PPCE500_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/platform-bus.h" #include "qom/object.h" =20 diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h index 32654dc274f..95dc58b5adb 100644 --- a/include/hw/acpi/cpu.h +++ b/include/hw/acpi/cpu.h @@ -16,7 +16,7 @@ #include "hw/qdev-core.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/hotplug.h" =20 #define ACPI_CPU_HOTPLUG_REG_LEN 12 diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h index 714bbd326c4..a00238ed74a 100644 --- a/include/hw/arm/aspeed.h +++ b/include/hw/arm/aspeed.h @@ -9,7 +9,7 @@ #ifndef ARM_ASPEED_H #define ARM_ASPEED_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qom/object.h" #include "hw/arm/aspeed_soc.h" =20 diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h index 3f64d5eb024..3ed39384e59 100644 --- a/include/hw/arm/machines-qom.h +++ b/include/hw/arm/machines-qom.h @@ -9,7 +9,7 @@ #ifndef HW_ARM_MACHINES_QOM_H #define HW_ARM_MACHINES_QOM_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" =20 #define TYPE_TARGET_ARM_MACHINE \ "target-info-arm-machine" diff --git a/include/hw/arm/npcm7xx.h b/include/hw/arm/npcm7xx.h index 56536565b74..eef7cc5332b 100644 --- a/include/hw/arm/npcm7xx.h +++ b/include/hw/arm/npcm7xx.h @@ -16,7 +16,7 @@ #ifndef NPCM7XX_H #define NPCM7XX_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/adc/npcm7xx_adc.h" #include "hw/core/split-irq.h" #include "hw/cpu/a9mpcore.h" diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platfor= m.h index 7bc4807fa51..c52b9e298d5 100644 --- a/include/hw/arm/raspi_platform.h +++ b/include/hw/arm/raspi_platform.h @@ -28,7 +28,7 @@ #ifndef HW_ARM_RASPI_PLATFORM_H #define HW_ARM_RASPI_PLATFORM_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/arm/boot.h" =20 /* Registered machine type (matches RPi Foundation bootloader and U-Boot) = */ diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index c77a33f6df2..8694aaa4e2a 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -32,7 +32,7 @@ =20 #include "exec/hwaddr.h" #include "qemu/notify.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/acpi/ghes.h" #include "hw/arm/boot.h" #include "hw/arm/bsa.h" diff --git a/include/hw/boards.h b/include/hw/core/boards.h similarity index 100% rename from include/hw/boards.h rename to include/hw/core/boards.h diff --git a/include/hw/cxl/cxl_host.h b/include/hw/cxl/cxl_host.h index cd3c368c86a..21619bb748a 100644 --- a/include/hw/cxl/cxl_host.h +++ b/include/hw/cxl/cxl_host.h @@ -8,7 +8,7 @@ */ =20 #include "hw/cxl/cxl.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 #ifndef CXL_HOST_H #define CXL_HOST_H diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index e73d1e65de8..6b9a5065272 100644 --- a/include/hw/i386/microvm.h +++ b/include/hw/i386/microvm.h @@ -21,7 +21,7 @@ #include "exec/hwaddr.h" #include "qemu/notify.h" =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i386/x86.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/pci-host/gpex.h" diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index e83157ab358..ade2da92bad 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -4,7 +4,7 @@ #include "qemu/notify.h" #include "qapi/qapi-types-common.h" #include "qemu/uuid.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/block/fdc.h" #include "hw/block/flash.h" #include "hw/i386/x86.h" diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index 8755cad50a3..0dffba95f9a 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -20,7 +20,7 @@ #include "exec/hwaddr.h" #include "system/memory.h" =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i386/topology.h" #include "hw/intc/ioapic.h" #include "hw/isa/isa.h" diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h index 27b17558020..8a04dd83146 100644 --- a/include/hw/loongarch/virt.h +++ b/include/hw/loongarch/virt.h @@ -8,7 +8,7 @@ #ifndef HW_LOONGARCH_H #define HW_LOONGARCH_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qemu/queue.h" #include "hw/block/flash.h" #include "hw/loongarch/boot.h" diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h index 9caaed9692b..c92da2e2ac7 100644 --- a/include/hw/m68k/q800.h +++ b/include/hw/m68k/q800.h @@ -23,7 +23,7 @@ #ifndef HW_Q800_H #define HW_Q800_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qom/object.h" #include "target/m68k/cpu-qom.h" #include "system/memory.h" diff --git a/include/hw/misc/lasi.h b/include/hw/misc/lasi.h index 0e95be1c32a..5e40c6aebdf 100644 --- a/include/hw/misc/lasi.h +++ b/include/hw/misc/lasi.h @@ -13,7 +13,7 @@ #define LASI_H =20 #include "system/address-spaces.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/sysbus.h" =20 #define TYPE_LASI_CHIP "lasi-chip" diff --git a/include/hw/openrisc/boot.h b/include/hw/openrisc/boot.h index 9b4d88072c4..3c481bdea68 100644 --- a/include/hw/openrisc/boot.h +++ b/include/hw/openrisc/boot.h @@ -20,7 +20,7 @@ #define OPENRISC_BOOT_H =20 #include "exec/cpu-defs.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 hwaddr openrisc_load_kernel(ram_addr_t ram_size, const char *kernel_filename, diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h index cbdddfc73cd..a8c1968f281 100644 --- a/include/hw/ppc/pnv.h +++ b/include/hw/ppc/pnv.h @@ -21,7 +21,7 @@ #define PPC_PNV_H =20 #include "cpu.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/sysbus.h" #include "hw/ipmi/ipmi.h" #include "hw/ppc/pnv_pnor.h" diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 28cf2723d84..5476ac7ce7b 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -3,7 +3,7 @@ =20 #include "qemu/units.h" #include "system/dma.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/ppc/spapr_drc.h" #include "hw/mem/pc-dimm.h" #include "hw/ppc/spapr_ovec.h" diff --git a/include/hw/ppc/spapr_numa.h b/include/hw/ppc/spapr_numa.h index 7cb33674006..e07edf2ee67 100644 --- a/include/hw/ppc/spapr_numa.h +++ b/include/hw/ppc/spapr_numa.h @@ -13,7 +13,7 @@ #ifndef HW_SPAPR_NUMA_H #define HW_SPAPR_NUMA_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/ppc/spapr.h" =20 /* diff --git a/include/hw/remote/machine.h b/include/hw/remote/machine.h index ac32fda3875..748b69c6fc7 100644 --- a/include/hw/remote/machine.h +++ b/include/hw/remote/machine.h @@ -12,7 +12,7 @@ #define REMOTE_MACHINE_H =20 #include "qom/object.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/pci-host/remote.h" #include "io/channel.h" #include "hw/remote/iohub.h" diff --git a/include/hw/riscv/microchip_pfsoc.h b/include/hw/riscv/microchi= p_pfsoc.h index 7ca9b976c10..a30b944afa9 100644 --- a/include/hw/riscv/microchip_pfsoc.h +++ b/include/hw/riscv/microchip_pfsoc.h @@ -22,7 +22,7 @@ #ifndef HW_MICROCHIP_PFSOC_H #define HW_MICROCHIP_PFSOC_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/char/mchp_pfsoc_mmuart.h" #include "hw/cpu/cluster.h" #include "hw/dma/sifive_pdma.h" diff --git a/include/hw/riscv/numa.h b/include/hw/riscv/numa.h index 147f01619b9..2d9c41ba818 100644 --- a/include/hw/riscv/numa.h +++ b/include/hw/riscv/numa.h @@ -19,7 +19,7 @@ #ifndef RISCV_NUMA_H #define RISCV_NUMA_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/sysbus.h" #include "system/numa.h" =20 diff --git a/include/hw/riscv/opentitan.h b/include/hw/riscv/opentitan.h index 609473d07b4..5b9016e1d89 100644 --- a/include/hw/riscv/opentitan.h +++ b/include/hw/riscv/opentitan.h @@ -24,7 +24,7 @@ #include "hw/char/ibex_uart.h" #include "hw/timer/ibex_timer.h" #include "hw/ssi/ibex_spi_host.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qom/object.h" =20 #define TYPE_RISCV_IBEX_SOC "riscv.lowrisc.ibex.soc" diff --git a/include/hw/riscv/shakti_c.h b/include/hw/riscv/shakti_c.h index 539fe1156de..f90a3bca8df 100644 --- a/include/hw/riscv/shakti_c.h +++ b/include/hw/riscv/shakti_c.h @@ -20,7 +20,7 @@ #define HW_SHAKTI_C_H =20 #include "hw/riscv/riscv_hart.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/char/shakti_uart.h" =20 #define TYPE_RISCV_SHAKTI_SOC "riscv.shakti.cclass.soc" diff --git a/include/hw/riscv/sifive_e.h b/include/hw/riscv/sifive_e.h index 31180a680e6..4cf902ebc0d 100644 --- a/include/hw/riscv/sifive_e.h +++ b/include/hw/riscv/sifive_e.h @@ -23,7 +23,7 @@ #include "hw/riscv/sifive_cpu.h" #include "hw/gpio/sifive_gpio.h" #include "hw/misc/sifive_e_aon.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 #define TYPE_RISCV_E_SOC "riscv.sifive.e.soc" #define RISCV_E_SOC(obj) \ diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index 0696f859427..e4c9860d501 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -19,7 +19,7 @@ #ifndef HW_SIFIVE_U_H #define HW_SIFIVE_U_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/cpu/cluster.h" #include "hw/dma/sifive_pdma.h" #include "hw/net/cadence_gem.h" diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h index 0c2a2237630..acd41e90583 100644 --- a/include/hw/riscv/spike.h +++ b/include/hw/riscv/spike.h @@ -19,7 +19,7 @@ #ifndef HW_RISCV_SPIKE_H #define HW_RISCV_SPIKE_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/riscv/riscv_hart.h" #include "hw/sysbus.h" =20 diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 7b4c2c8b7de..806b78cc639 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -19,7 +19,7 @@ #ifndef HW_RISCV_VIRT_H #define HW_RISCV_VIRT_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/riscv/riscv_hart.h" #include "hw/sysbus.h" #include "hw/block/flash.h" diff --git a/include/hw/riscv/xiangshan_kmh.h b/include/hw/riscv/xiangshan_= kmh.h index c5dc6b1a9a7..5a5af93dffd 100644 --- a/include/hw/riscv/xiangshan_kmh.h +++ b/include/hw/riscv/xiangshan_kmh.h @@ -10,7 +10,7 @@ #ifndef HW_XIANGSHAN_KMH_H #define HW_XIANGSHAN_KMH_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/riscv/riscv_hart.h" =20 #define XIANGSHAN_KMH_MAX_CPUS 16 diff --git a/include/hw/s390x/cpu-topology.h b/include/hw/s390x/cpu-topolog= y.h index d5e9aa43f8f..2d5a5fa3646 100644 --- a/include/hw/s390x/cpu-topology.h +++ b/include/hw/s390x/cpu-topology.h @@ -12,7 +12,7 @@ #ifndef CONFIG_USER_ONLY =20 #include "qemu/queue.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qapi/qapi-types-machine-s390x.h" =20 #define S390_TOPOLOGY_CPU_IFL 0x03 diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-vir= tio-ccw.h index 526078a4e2b..f1f06119d6d 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -11,7 +11,7 @@ #ifndef HW_S390X_S390_VIRTIO_CCW_H #define HW_S390X_S390_VIRTIO_CCW_H =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qom/object.h" #include "hw/s390x/sclp.h" =20 diff --git a/include/hw/tricore/triboard.h b/include/hw/tricore/triboard.h index ca49a0c7520..c6be4dc3f34 100644 --- a/include/hw/tricore/triboard.h +++ b/include/hw/tricore/triboard.h @@ -19,7 +19,7 @@ */ =20 #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/system.h" #include "system/address-spaces.h" #include "qom/object.h" diff --git a/include/hw/xen/xen-pvh-common.h b/include/hw/xen/xen-pvh-commo= n.h index 5db83d88ecc..0ed07c56947 100644 --- a/include/hw/xen/xen-pvh-common.h +++ b/include/hw/xen/xen-pvh-common.h @@ -11,7 +11,7 @@ =20 #include "system/memory.h" #include "qom/object.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/pci-host/gpex.h" #include "hw/xen/xen-hvm-common.h" =20 diff --git a/include/system/kvm_int.h b/include/system/kvm_int.h index 9247493b029..baeb166d393 100644 --- a/include/system/kvm_int.h +++ b/include/system/kvm_int.h @@ -15,7 +15,7 @@ #include "qemu/queue.h" #include "system/kvm.h" #include "accel/accel-ops.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i386/topology.h" #include "io/channel-socket.h" =20 diff --git a/accel/accel-system.c b/accel/accel-system.c index 1e97c64fdca..150af05bf5b 100644 --- a/accel/accel-system.c +++ b/accel/accel-system.c @@ -27,7 +27,7 @@ #include "qemu/accel.h" #include "qapi/qapi-commands-accelerator.h" #include "monitor/monitor.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/core/cpu.h" #include "accel/accel-ops.h" #include "accel/accel-cpu-ops.h" diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c index 0a4b498e836..77f4e4e4f30 100644 --- a/accel/hvf/hvf-all.c +++ b/accel/hvf/hvf-all.c @@ -16,7 +16,7 @@ #include "system/hvf.h" #include "system/hvf_int.h" #include "hw/core/cpu.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "trace.h" =20 bool hvf_allowed; diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index f9254ae6546..4cb2ea6c84a 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -53,7 +53,7 @@ #include "system/dirtylimit.h" #include "qemu/range.h" =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/stats.h" =20 /* This check must be after config-host.h is included */ diff --git a/accel/mshv/mshv-all.c b/accel/mshv/mshv-all.c index 80428d130d5..47c67ef8cc9 100644 --- a/accel/mshv/mshv-all.c +++ b/accel/mshv/mshv-all.c @@ -19,7 +19,7 @@ #include "qemu/event_notifier.h" #include "qemu/module.h" #include "qemu/main-loop.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 #include "hw/hyperv/hvhdk.h" #include "hw/hyperv/hvhdk_mini.h" diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/tcg-accel-ops-mttc= g.c index cf1ee7ac258..89299829c3a 100644 --- a/accel/tcg/tcg-accel-ops-mttcg.c +++ b/accel/tcg/tcg-accel-ops-mttcg.c @@ -30,7 +30,7 @@ #include "qemu/main-loop.h" #include "qemu/notify.h" #include "qemu/guest-random.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "tcg/startup.h" #include "tcg-accel-ops.h" #include "tcg-accel-ops-mttcg.h" diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index 18ea0c58b0b..8eb4a6b89e8 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -37,7 +37,7 @@ #include "qemu/units.h" #include "qemu/target-info.h" #ifndef CONFIG_USER_ONLY -#include "hw/boards.h" +#include "hw/core/boards.h" #include "exec/tb-flush.h" #include "system/runstate.h" #endif diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c index 97377d67d1c..bb2d02cb221 100644 --- a/accel/xen/xen-all.c +++ b/accel/xen/xen-all.c @@ -26,7 +26,7 @@ #include "system/runstate.h" #include "migration/misc.h" #include "migration/global_state.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 bool xen_allowed; =20 diff --git a/backends/hostmem.c b/backends/hostmem.c index 35734d6f4d1..d5834916648 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "system/hostmem.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qapi/error.h" #include "qapi/qapi-builtin-visit.h" #include "qapi/visitor.h" diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index 3640d1f3dce..3391cee4d21 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -36,7 +36,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/block-backend.h" #include "system/blockdev.h" #include "qapi/qapi-commands-block.h" diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index dd5fb5667cc..c362d56bcde 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -38,7 +38,7 @@ #include "gdbstub/user.h" #else #include "hw/cpu/cluster.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #endif #include "hw/core/cpu.h" =20 diff --git a/gdbstub/system.c b/gdbstub/system.c index e2220c1ae48..79f80256e3a 100644 --- a/gdbstub/system.c +++ b/gdbstub/system.c @@ -25,7 +25,7 @@ #include "system/replay.h" #include "hw/core/cpu.h" #include "hw/cpu/cluster.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "chardev/char.h" #include "chardev/char-fe.h" #include "monitor/monitor.h" diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 2d5826a8f13..dad4cfcc7d8 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -25,7 +25,7 @@ #include "qemu/bswap.h" #include "qemu/bitops.h" #include "system/numa.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/acpi/tpm.h" #include "hw/pci/pci_host.h" #include "hw/pci/pci_bus.h" diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index 9b974b7274a..2f17d45907d 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -1,7 +1,7 @@ #include "qemu/osdep.h" #include "hw/acpi/memory_hotplug.h" #include "hw/mem/pc-dimm.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-core.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c index 2228f1245e2..8c7ed104796 100644 --- a/hw/acpi/pci.c +++ b/hw/acpi/pci.c @@ -27,7 +27,7 @@ #include "qemu/error-report.h" #include "qom/object_interfaces.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/pci.h" #include "hw/pci/pci_bridge.h" diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index dc910d4177b..1886df03839 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -24,7 +24,7 @@ #include "hw/arm/allwinner-a10.h" #include "hw/misc/unimp.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/usb/hcd-ohci.h" #include "hw/loader.h" #include "target/arm/cpu-qom.h" diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c index c8eda39957c..313bd21fad8 100644 --- a/hw/arm/allwinner-r40.c +++ b/hw/arm/allwinner-r40.c @@ -22,7 +22,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/units.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-core.h" #include "hw/sysbus.h" #include "hw/char/serial-mm.h" diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c index b96ef3f97ab..a0cbe50d78d 100644 --- a/hw/arm/aspeed_ast27x0-fc.c +++ b/hw/arm/aspeed_ast27x0-fc.c @@ -15,7 +15,7 @@ #include "system/block-backend.h" #include "system/system.h" #include "hw/arm/aspeed.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-clock.h" #include "hw/arm/aspeed_soc.h" #include "hw/loader.h" diff --git a/hw/arm/b-l475e-iot01a.c b/hw/arm/b-l475e-iot01a.c index f1fbc774e52..a724b5fdb20 100644 --- a/hw/arm/b-l475e-iot01a.c +++ b/hw/arm/b-l475e-iot01a.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "hw/arm/boot.h" diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c index 0f6d98684b9..fd347e18d26 100644 --- a/hw/arm/bananapi_m2u.c +++ b/hw/arm/bananapi_m2u.c @@ -22,7 +22,7 @@ #include "system/address-spaces.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i2c/i2c.h" #include "hw/qdev-properties.h" #include "hw/arm/allwinner-r40.h" diff --git a/hw/arm/boot.c b/hw/arm/boot.c index b91660208f5..9b6eaf642e9 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -22,7 +22,7 @@ #include "system/system.h" #include "system/memory.h" #include "system/numa.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/reset.h" #include "hw/loader.h" #include "hw/mem/memory-device.h" diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 5a80b7a2238..73c40bc57da 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -12,7 +12,7 @@ #include "qemu/units.h" #include "qemu/cutils.h" #include "hw/sysbus.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "strongarm.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index aa51c0a7034..9fe282342ab 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/arm/allwinner-a10.h" #include "hw/arm/boot.h" diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 23b596d0c81..d986e8f7a24 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/datadir.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qemu/error-report.h" #include "hw/arm/digic.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 89f0e944632..66af0e2376d 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -33,7 +33,7 @@ #include "hw/arm/exynos4210.h" #include "hw/net/lan9118.h" #include "hw/qdev-properties.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/irq.h" #include "target/arm/cpu-qom.h" =20 diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c index 70d3a99d79e..9d976c3d142 100644 --- a/hw/arm/fby35.c +++ b/hw/arm/fby35.c @@ -10,7 +10,7 @@ #include "qapi/error.h" #include "system/system.h" #include "system/block-backend.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-clock.h" #include "hw/arm/aspeed_soc.h" #include "hw/arm/boot.h" diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index f3a60022d84..50b34139fa2 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -24,7 +24,7 @@ #include "hw/arm/fsl-imx6.h" #include "hw/misc/unimp.h" #include "hw/usb/imx-usb-phy.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "system/system.h" #include "chardev/char.h" diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c index 883c7fc534f..225e1791263 100644 --- a/hw/arm/fsl-imx6ul.c +++ b/hw/arm/fsl-imx6ul.c @@ -21,7 +21,7 @@ #include "hw/arm/fsl-imx6ul.h" #include "hw/misc/unimp.h" #include "hw/usb/imx-usb-phy.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/system.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c index 02f7602077f..9a230d222fd 100644 --- a/hw/arm/fsl-imx7.c +++ b/hw/arm/fsl-imx7.c @@ -22,7 +22,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx7.h" #include "hw/misc/unimp.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/system.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c index ee6f3e42d23..79f91427772 100644 --- a/hw/arm/fsl-imx8mp.c +++ b/hw/arm/fsl-imx8mp.c @@ -13,7 +13,7 @@ #include "hw/arm/bsa.h" #include "hw/arm/fsl-imx8mp.h" #include "hw/misc/unimp.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/kvm.h" #include "system/system.h" #include "target/arm/cpu.h" diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index bd60ab26898..82fa9647119 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -28,7 +28,7 @@ #include "net/net.h" #include "system/runstate.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qemu/error-report.h" #include "hw/char/pl011.h" #include "hw/ide/ahci-sysbus.h" diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index 71a46062032..21860ed14d3 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -29,7 +29,7 @@ #include "hw/arm/fsl-imx25.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qemu/error-report.h" #include "system/qtest.h" #include "hw/i2c/i2c.h" diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index 44e06019670..ed8c52e1bd2 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -11,7 +11,7 @@ #include "hw/arm/boot.h" #include "hw/arm/fsl-imx8mp.h" #include "hw/arm/machines-qom.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "system/kvm.h" #include "system/qtest.h" diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index b030710b29d..436fcdd5101 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -11,7 +11,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "hw/misc/arm_integrator_debug.h" diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index b446dc15470..168ecf35d09 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -18,7 +18,7 @@ #include "hw/arm/fsl-imx31.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qemu/error-report.h" #include "system/address-spaces.h" #include "net/net.h" diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c index c4f6b5b1b04..e4ceb7efcd5 100644 --- a/hw/arm/max78000fthr.c +++ b/hw/arm/max78000fthr.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/qdev-clock.h" #include "qemu/error-report.h" diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index f47a265650e..5fe6526ba0a 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -15,7 +15,7 @@ #include "hw/arm/fsl-imx6ul.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index fc8f35c5810..b1b56b920d4 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -17,7 +17,7 @@ #include "hw/arm/fsl-imx7.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index 0f3161fd931..cd035fffc76 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "system/system.h" diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 55dd68c57e1..3188caf2228 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -54,7 +54,7 @@ #include "hw/arm/armv7m.h" #include "hw/arm/machines-qom.h" #include "hw/or-irq.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/address-spaces.h" #include "system/system.h" #include "system/reset.h" diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index fa4b200577f..bf5e07019ff 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -33,7 +33,7 @@ #include "hw/arm/armv7m.h" #include "hw/arm/machines-qom.h" #include "hw/or-irq.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/address-spaces.h" #include "system/system.h" #include "hw/qdev-properties.h" diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index fcb8777cafd..b63002f4835 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -31,7 +31,7 @@ #include "system/address-spaces.h" #include "cpu.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/or-irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index c26feccb15b..78d98c4a407 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -29,7 +29,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/musca.c b/hw/arm/musca.c index a3494c96bf4..7b30d9bd446 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -27,7 +27,7 @@ #include "hw/arm/boot.h" #include "hw/arm/armsse.h" #include "hw/arm/machines-qom.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/char/pl011.h" #include "hw/core/split-irq.h" #include "hw/misc/tz-mpc.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 675707691c0..3e624540960 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -18,7 +18,7 @@ #include "hw/arm/machines-qom.h" #include "net/net.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "qemu/timer.h" #include "hw/ptimer.h" diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index bce0d6f87a9..1657612fe77 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/qdev-clock.h" #include "qemu/error-report.h" diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index 8594081fe47..746a3deef8e 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/qdev-clock.h" #include "qemu/error-report.h" diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c index a276fea6985..3ad7643b4bd 100644 --- a/hw/arm/npcm8xx.c +++ b/hw/arm/npcm8xx.c @@ -16,7 +16,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/arm/boot.h" #include "hw/arm/bsa.h" #include "hw/arm/npcm8xx.h" diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c index b179eadef53..f775b324027 100644 --- a/hw/arm/npcm8xx_boards.c +++ b/hw/arm/npcm8xx_boards.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" =20 #include "chardev/char.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/arm/npcm8xx.h" #include "hw/arm/machines-qom.h" #include "hw/core/cpu.h" diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c index c5f60383335..d15545ff07a 100644 --- a/hw/arm/olimex-stm32-h405.c +++ b/hw/arm/olimex-stm32-h405.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/qdev-clock.h" #include "qemu/error-report.h" diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 730525be2dc..d858dab3253 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -30,7 +30,7 @@ #include "qapi/error.h" #include "ui/console.h" #include "hw/arm/omap.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "hw/block/flash.h" diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index 3e237e78fa1..c0dd32f13ce 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -22,7 +22,7 @@ #include "system/address-spaces.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/arm/allwinner-h3.h" #include "hw/arm/boot.h" diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 81d2fa1b67d..910c18213a5 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -22,7 +22,7 @@ #include "hw/arm/raspi_platform.h" #include "hw/registerfields.h" #include "qemu/error-report.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 0422ae0f00b..058df2c4c96 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -17,7 +17,7 @@ #include "hw/registerfields.h" #include "qemu/error-report.h" #include "system/device_tree.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/arm/boot.h" #include "qom/object.h" diff --git a/hw/arm/realview.c b/hw/arm/realview.c index d8327a50d23..97008490f6a 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -21,7 +21,7 @@ #include "hw/qdev-core.h" #include "net/net.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i2c/i2c.h" #include "qemu/error-report.h" #include "hw/char/pl011.h" diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index 5b4ab7d77a5..99cbd5e2fea 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -15,7 +15,7 @@ #include "hw/arm/fsl-imx6.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 3ba69d37d79..32d4c52bf50 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -37,7 +37,7 @@ #include "hw/arm/smmuv3.h" #include "hw/arm/machines-qom.h" #include "hw/block/flash.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/ide/ide-bus.h" #include "hw/ide/ahci-sysbus.h" #include "hw/intc/arm_gicv3_common.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 8113bbd5d8b..d1cbf43777e 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -19,7 +19,7 @@ #include "qemu/timer.h" #include "hw/i2c/i2c.h" #include "net/net.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qemu/log.h" #include "system/address-spaces.h" #include "system/system.h" diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index c11029f8bd4..4843c5565b6 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/qdev-clock.h" #include "qemu/error-report.h" diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index c3c99a2da68..dd1047f6c62 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -20,7 +20,7 @@ #include "hw/i2c/i2c.h" #include "hw/i2c/arm_sbcon_i2c.h" #include "hw/irq.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/block/flash.h" #include "qemu/error-report.h" #include "hw/char/pl011.h" diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 3492e03a656..2f61ad0dd62 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -32,7 +32,7 @@ #include "hw/i2c/i2c.h" #include "net/net.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/block/flash.h" #include "system/device_tree.h" diff --git a/hw/arm/xen-pvh.c b/hw/arm/xen-pvh.c index 86a02966161..10cac28a910 100644 --- a/hw/arm/xen-pvh.c +++ b/hw/arm/xen-pvh.c @@ -7,7 +7,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/qapi-commands-migration.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/system.h" #include "hw/xen/xen-pvh-common.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index c82edd3bed1..a6dc644d0bd 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -23,7 +23,7 @@ #include "hw/arm/machines-qom.h" #include "net/net.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/block/flash.h" #include "hw/loader.h" #include "hw/adc/zynq-xadc.h" diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 5e05521a572..e82ac8e3538 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -16,7 +16,7 @@ #include "system/device_tree.h" #include "system/address-spaces.h" #include "hw/block/flash.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/sysbus.h" #include "hw/arm/fdt.h" #include "hw/arm/xlnx-versal.h" diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index 06a3d7dfe7f..3ba2736bab3 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -20,7 +20,7 @@ #include "hw/arm/xlnx-zynqmp.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qemu/error-report.h" #include "qemu/log.h" #include "system/device_tree.h" diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index ffed6e5126e..5f0e34ccecf 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -21,7 +21,7 @@ #include "hw/arm/xlnx-zynqmp.h" #include "hw/intc/arm_gic_common.h" #include "hw/misc/unimp.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/system.h" #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index 8c306c89e45..fb8421184d5 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -31,7 +31,7 @@ #include "exec/log.h" #include "exec/gdbstub.h" #include "system/tcg.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "trace.h" #ifdef CONFIG_PLUGIN diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 433efb73872..be4fe867e4d 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -33,7 +33,7 @@ #include "qemu/osdep.h" #include "system/dma.h" #include "system/reset.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/qdev-properties.h" #include "qapi/error.h" diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c index 618455e5566..07c36464047 100644 --- a/hw/core/guest-loader.c +++ b/hw/core/guest-loader.c @@ -33,7 +33,7 @@ #include "qemu/module.h" #include "guest-loader.h" #include "system/device_tree.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 /* * Insert some FDT nodes for the loaded blob. diff --git a/hw/core/loader.c b/hw/core/loader.c index 590c5b02aa1..385730e8ef5 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -61,7 +61,7 @@ #include "hw/loader.h" #include "hw/nvram/fw_cfg.h" #include "system/memory.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qemu/cutils.h" #include "system/runstate.h" #include "tcg/debuginfo.h" diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c index 74a56600be8..46846f741a2 100644 --- a/hw/core/machine-hmp-cmds.c +++ b/hw/core/machine-hmp-cmds.c @@ -24,7 +24,7 @@ #include "qapi/string-output-visitor.h" #include "qemu/error-report.h" #include "system/numa.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 void hmp_info_cpus(Monitor *mon, const QDict *qdict) { diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 28dfd3e15bd..d23466177d8 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "hw/acpi/vmgenid.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/intc/intc.h" #include "hw/mem/memory-device.h" #include "qapi/error.h" diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c index 0be0ac044c2..189c70015fd 100644 --- a/hw/core/machine-smp.c +++ b/hw/core/machine-smp.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qapi/error.h" #include "qemu/error-report.h" =20 diff --git a/hw/core/machine.c b/hw/core/machine.c index 06e0c9a179b..dea257c3086 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -14,7 +14,7 @@ #include "qemu/units.h" #include "qemu/accel.h" #include "system/replay.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 67b769bd3e0..c52b022d3aa 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -13,7 +13,7 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/address-spaces.h" #include "hw/core/cpu.h" #include "hw/arm/machines-qom.h" diff --git a/hw/core/numa.c b/hw/core/numa.c index 218576f7455..fa78dacb6be 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -35,7 +35,7 @@ #include "system/qtest.h" #include "hw/core/cpu.h" #include "hw/mem/pc-dimm.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/mem/memory-device.h" #include "qemu/option.h" #include "qemu/config-file.h" diff --git a/hw/core/qdev-hotplug.c b/hw/core/qdev-hotplug.c index ff176dc1bb3..d2c39806c53 100644 --- a/hw/core/qdev-hotplug.c +++ b/hw/core/qdev-hotplug.c @@ -11,7 +11,7 @@ =20 #include "qemu/osdep.h" #include "hw/qdev-core.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qapi/error.h" =20 HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index fab42a72705..423a3a1d660 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -34,7 +34,7 @@ #include "qemu/option.h" #include "hw/irq.h" #include "hw/qdev-properties.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/sysbus.h" #include "hw/qdev-clock.h" #include "migration/vmstate.h" diff --git a/hw/cpu/core.c b/hw/cpu/core.c index 5cb2e9a7f54..26e488f3d8e 100644 --- a/hw/cpu/core.c +++ b/hw/cpu/core.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/cpu/core.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/cxl/cxl-host.c b/hw/cxl/cxl-host.c index 0d891c651df..f3479b19914 100644 --- a/hw/cxl/cxl-host.c +++ b/hw/cxl/cxl-host.c @@ -11,7 +11,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "system/qtest.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 #include "qapi/qapi-visit-machine.h" #include "hw/cxl/cxl.h" diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c index 2d6d7db4ee0..ac024accfcd 100644 --- a/hw/hyperv/hv-balloon.c +++ b/hw/hyperv/hv-balloon.c @@ -13,7 +13,7 @@ #include "system/address-spaces.h" #include "exec/cpu-common.h" #include "system/ramblock.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/hyperv/dynmem-proto.h" #include "hw/hyperv/hv-balloon.h" #include "hw/hyperv/vmbus.h" diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index 4e685fd26e7..ead53d2724d 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -19,7 +19,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i2c/pm_smbus.h" #include "hw/i2c/smbus_master.h" #include "migration/vmstate.h" diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index 26e211b31ad..ce3723e1483 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i2c/i2c.h" #include "hw/i2c/smbus_slave.h" #include "hw/qdev-properties.h" diff --git a/hw/i386/vapic.c b/hw/i386/vapic.c index f1089f0a7c8..3a4254638b2 100644 --- a/hw/i386/vapic.c +++ b/hw/i386/vapic.c @@ -20,7 +20,7 @@ #include "system/address-spaces.h" #include "hw/i386/apic_internal.h" #include "hw/sysbus.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "migration/vmstate.h" #include "qom/object.h" =20 diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c index 6d93457c526..32e02e1eeb0 100644 --- a/hw/i386/vmport.c +++ b/hw/i386/vmport.c @@ -32,7 +32,7 @@ #include "hw/isa/isa.h" #include "hw/i386/vmport.h" #include "hw/qdev-properties.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/system.h" #include "system/hw_accel.h" #include "system/qtest.h" diff --git a/hw/i386/xen/xen-pvh.c b/hw/i386/xen/xen-pvh.c index 067f73e9773..ab90c83a830 100644 --- a/hw/i386/xen/xen-pvh.c +++ b/hw/i386/xen/xen-pvh.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/system.h" #include "hw/xen/arch_hvm.h" #include diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index ec9e978b0b4..83e1bc2d759 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -27,7 +27,7 @@ #include "hw/i386/apic_internal.h" #include "hw/intc/kvm_irqcount.h" #include "trace.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/kvm.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c index fc8005c9444..2a4557a8baa 100644 --- a/hw/intc/loongarch_ipi.c +++ b/hw/intc/loongarch_ipi.c @@ -7,7 +7,7 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qapi/error.h" #include "hw/intc/loongarch_ipi.h" #include "hw/qdev-properties.h" diff --git a/hw/intc/loongarch_pic_kvm.c b/hw/intc/loongarch_pic_kvm.c index 6cfddf45206..7a8b4e7b666 100644 --- a/hw/intc/loongarch_pic_kvm.c +++ b/hw/intc/loongarch_pic_kvm.c @@ -7,7 +7,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/intc/loongarch_pch_pic.h" #include "hw/loongarch/virt.h" #include "system/kvm.h" diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c index a2041e70224..a559664c40b 100644 --- a/hw/intc/riscv_aplic.c +++ b/hw/intc/riscv_aplic.c @@ -25,7 +25,7 @@ #include "system/address-spaces.h" #include "hw/sysbus.h" #include "hw/pci/msi.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/intc/riscv_aplic.h" #include "hw/irq.h" diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c index 6174e1a05d4..513e38d9c12 100644 --- a/hw/intc/riscv_imsic.c +++ b/hw/intc/riscv_imsic.c @@ -25,7 +25,7 @@ #include "system/address-spaces.h" #include "hw/sysbus.h" #include "hw/pci/msi.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/intc/riscv_imsic.h" #include "hw/irq.h" diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 49434ad1828..a78a9bc03d8 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -9,7 +9,7 @@ #include "qemu/datadir.h" #include "qapi/error.h" #include "exec/target_page.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "system/kvm.h" #include "system/tcg.h" diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index ff21d7779e1..f67611ba0b2 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -10,7 +10,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/m68k/mcf.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "elf.h" #include "qemu/error-report.h" diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index a25e782403f..6359aa81d0e 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -11,7 +11,7 @@ #include "qemu/log.h" #include "cpu.h" #include "hw/qdev-properties.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/irq.h" #include "hw/m68k/mcf.h" #include "qemu/timer.h" diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 4a585b231db..c1067435bf8 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -29,7 +29,7 @@ #include "system/system.h" #include "system/qtest.h" #include "net/net.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/sysbus.h" #include "elf.h" diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index cfb2b319e5e..d7c460bcd4b 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -17,7 +17,7 @@ #include "system/qtest.h" #include "hw/irq.h" #include "hw/m68k/next-cube.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/scsi/esp.h" #include "hw/sysbus.h" diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c index 36de67c328e..d663d124fce 100644 --- a/hw/m68k/q800-glue.c +++ b/hw/m68k/q800-glue.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "hw/m68k/q800-glue.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/irq.h" #include "hw/nmi.h" #include "hw/qdev-properties.h" diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index b8676feb418..1aaaada3465 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -27,7 +27,7 @@ #include "exec/target_page.h" #include "system/system.h" #include "cpu.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/or-irq.h" #include "elf.h" #include "hw/loader.h" diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 3f65d915561..6f2b7bb5a08 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -13,7 +13,7 @@ #include "exec/target_page.h" #include "system/system.h" #include "cpu.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "elf.h" #include "hw/loader.h" diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 1a432e9bd22..9cf82b84cf4 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -13,7 +13,7 @@ #include "qemu/error-report.h" #include "hw/mem/memory-device.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qemu/range.h" #include "hw/virtio/vhost.h" #include "system/kvm.h" diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index f701d5b5f9b..33e5a376ffa 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -19,7 +19,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/mem/pc-dimm.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index ec38107f503..39eb2386e8f 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -33,7 +33,7 @@ #include "qemu/guest-random.h" #include "system/device_tree.h" #include "system/reset.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "elf.h" #include "qemu/cutils.h" diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_= ml605_mmu.c index 6e923c49cfc..f5b9b2e8904 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -33,7 +33,7 @@ #include "net/net.h" #include "hw/block/flash.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "hw/qdev-properties.h" #include "system/address-spaces.h" diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petal= ogix_s3adsp1800_mmu.c index e8d0ddfdf86..266ecf9e8ab 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -31,7 +31,7 @@ #include "net/net.h" #include "hw/block/flash.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/misc/unimp.h" #include "system/address-spaces.h" #include "hw/char/xilinx_uartlite.h" diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pm= u.c index e909802bb74..f4c55589b7f 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "system/address-spaces.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "cpu.h" #include "boot.h" =20 diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 6a4fcdd9ca7..dc9da0b0401 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -21,7 +21,7 @@ #include "qemu/units.h" =20 #include "elf.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "hw/ide/pci.h" #include "hw/ide/ahci-pci.h" diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 5fe40eee65a..e777863703d 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -25,7 +25,7 @@ #include "cpu.h" #include "hw/clock.h" #include "net/net.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/block/flash.h" #include "hw/mips/mips.h" diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 1d6bdc00917..1708cec3f8c 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -33,7 +33,7 @@ #include "hw/isa/isa.h" #include "hw/block/fdc.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "net/net.h" #include "hw/scsi/esp.h" #include "hw/loader.h" diff --git a/hw/mips/malta.c b/hw/mips/malta.c index a4e2ea98ade..f39e56d2798 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -34,7 +34,7 @@ #include "hw/isa/superio.h" #include "hw/char/serial-mm.h" #include "net/net.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/block/flash.h" #include "hw/mips/mips.h" diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index aa240504935..b696bf39e12 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -28,7 +28,7 @@ #include "system/dma.h" #include "system/reset.h" #include "system/address-spaces.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/nvram/fw_cfg.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index b7d9cdd9007..769107e835e 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -23,7 +23,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/irq.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "net/net.h" #include "hw/openrisc/boot.h" diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c index a98071c9365..3cfd1c0b5ce 100644 --- a/hw/openrisc/virt.c +++ b/hw/openrisc/virt.c @@ -13,7 +13,7 @@ #include "cpu.h" #include "system/address-spaces.h" #include "hw/irq.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "hw/core/split-irq.h" #include "hw/openrisc/boot.h" diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index 1bcceddbc4d..b3a5f16e22a 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -24,7 +24,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "system/numa.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qom/object.h" =20 enum BusType { PCI, PCIE, CXL }; diff --git a/hw/pci/pci.c b/hw/pci/pci.c index b1eba348e06..e03953813c2 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -46,7 +46,7 @@ #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/hotplug.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/nvram/fw_cfg.h" #include "qapi/error.h" #include "qemu/cutils.h" diff --git a/hw/ppc/amigaone.c b/hw/ppc/amigaone.c index 74a1fa3b635..3df4724a72b 100644 --- a/hw/ppc/amigaone.c +++ b/hw/ppc/amigaone.c @@ -14,7 +14,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/ppc/ppc.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/pci-host/articia.h" #include "hw/isa/vt82c686.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 739f1af3e18..bdc6c7ed7fe 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -54,7 +54,7 @@ #include "hw/ppc/ppc.h" #include "hw/qdev-properties.h" #include "hw/nvram/mac_nvram.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/pci-host/uninorth.h" #include "hw/input/adb.h" #include "hw/ppc/mac_dbdma.h" diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index cd2bb46442f..8d35080b9d1 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -31,7 +31,7 @@ #include "exec/target_page.h" #include "hw/ppc/ppc.h" #include "hw/qdev-properties.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/input/adb.h" #include "system/system.h" #include "net/net.h" diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c index 8ce185de3ea..3b48a54e7a0 100644 --- a/hw/ppc/pegasos.c +++ b/hw/ppc/pegasos.c @@ -24,7 +24,7 @@ #include "system/reset.h" #include "system/runstate.h" #include "system/qtest.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/fw-path-provider.h" #include "elf.h" diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 7e739a21147..824dd91ed5e 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -18,7 +18,7 @@ #include "exec/page-protection.h" #include "net/net.h" #include "hw/pci/pci.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/kvm.h" #include "system/device_tree.h" #include "hw/loader.h" diff --git a/hw/ppc/ppe42_machine.c b/hw/ppc/ppe42_machine.c index f14a91b4e4d..6c9bc89e2d6 100644 --- a/hw/ppc/ppe42_machine.c +++ b/hw/ppc/ppe42_machine.c @@ -10,7 +10,7 @@ #include "qemu/units.h" #include "qemu/error-report.h" #include "system/address-spaces.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/ppc/ppc.h" #include "system/system.h" #include "system/reset.h" diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 5654a60c595..0d5e1f604e6 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -31,7 +31,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/ppc/ppc.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/log.h" diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 038b98d0b81..992bfe39a36 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -16,7 +16,7 @@ #include "qemu/datadir.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/kvm.h" #include "kvm_ppc.h" #include "system/device_tree.h" diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 43a6d505a84..8221a01639d 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -32,7 +32,7 @@ #include "hw/block/flash.h" #include "system/system.h" #include "system/reset.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/device_tree.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c index 216b4876e24..13cda2f4813 100644 --- a/hw/remote/vfio-user-obj.c +++ b/hw/remote/vfio-user-obj.c @@ -44,7 +44,7 @@ #include "qemu/error-report.h" #include "trace.h" #include "system/runstate.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/remote/machine.h" #include "qapi/error.h" #include "qapi/qapi-visit-sockets.h" diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 75f34287ff1..4f207dee287 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -22,7 +22,7 @@ #include "qemu/units.h" #include "qemu/error-report.h" #include "exec/cpu-defs.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/riscv/boot.h" #include "hw/riscv/boot_opensbi.h" diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generi= c.c index e863c50cbc9..8a461a0dd56 100644 --- a/hw/riscv/microblaze-v-generic.c +++ b/hw/riscv/microblaze-v-generic.c @@ -20,7 +20,7 @@ #include "hw/sysbus.h" #include "system/system.h" #include "net/net.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "system/address-spaces.h" #include "hw/char/xilinx_uartlite.h" diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index a17f62cd082..4398f7b1825 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -40,7 +40,7 @@ #include "qemu/cutils.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/sysbus.h" #include "chardev/char.h" diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c index 7a7b0120077..726df2daf1f 100644 --- a/hw/riscv/numa.c +++ b/hw/riscv/numa.c @@ -20,7 +20,7 @@ #include "qemu/units.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/riscv/numa.h" #include "system/device_tree.h" diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c index d369a8a7dcd..309125e854b 100644 --- a/hw/riscv/opentitan.c +++ b/hw/riscv/opentitan.c @@ -23,7 +23,7 @@ #include "hw/riscv/opentitan.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/misc/unimp.h" #include "hw/riscv/boot.h" #include "qemu/units.h" diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c index 3e7f4411727..d309ea2e39e 100644 --- a/hw/riscv/shakti_c.c +++ b/hw/riscv/shakti_c.c @@ -17,7 +17,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/riscv/shakti_c.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 7baed1958e0..abe411e305e 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -32,7 +32,7 @@ #include "qemu/cutils.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/sysbus.h" #include "hw/misc/unimp.h" diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index a7492aa27a4..6839a2635e8 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -39,7 +39,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/irq.h" #include "hw/loader.h" #include "hw/sysbus.h" diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index b0bab3fe008..6aa688acf30 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/sysbus.h" #include "target/riscv/cpu.h" diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 17909206c7e..45a845318e7 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -23,7 +23,7 @@ #include "qemu/error-report.h" #include "qemu/guest-random.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/sysbus.h" #include "hw/qdev-properties.h" diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c index a95fd6174fd..e831954cb36 100644 --- a/hw/riscv/xiangshan_kmh.c +++ b/hw/riscv/xiangshan_kmh.c @@ -32,7 +32,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "system/address-spaces.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "hw/intc/riscv_aclint.h" #include "hw/intc/riscv_aplic.h" diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c index ed91c631788..1a33082857c 100644 --- a/hw/rx/rx-gdbsim.c +++ b/hw/rx/rx-gdbsim.c @@ -27,7 +27,7 @@ #include "system/qtest.h" #include "system/device_tree.h" #include "system/reset.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qom/object.h" =20 /* Same address of GDB integrated simulator */ diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c index b513f8936e4..9182ddb628d 100644 --- a/hw/s390x/cpu-topology.c +++ b/hw/s390x/cpu-topology.c @@ -19,7 +19,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/qdev-properties.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "target/s390x/cpu.h" #include "hw/s390x/s390-virtio-ccw.h" #include "hw/s390x/cpu-topology.h" diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 3843d2a8505..f1c2af15f75 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -21,7 +21,7 @@ #include "elf.h" #include "hw/loader.h" #include "hw/qdev-properties.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/s390x/virtio-ccw.h" #include "hw/s390x/vfio-ccw.h" #include "hw/s390x/css.h" diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 52820894fa1..3eea2f0c9d9 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -20,7 +20,7 @@ #include "hw/s390x/s390-pci-kvm.h" #include "hw/s390x/s390-pci-vfio.h" #include "hw/s390x/s390-virtio-ccw.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/pci/pci_bus.h" #include "hw/qdev-properties.h" #include "hw/pci/pci_bridge.h" diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 5841dfc4fec..6b67c3c109f 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -18,7 +18,7 @@ #include "qemu/error-report.h" #include "qemu/bswap.h" #include "system/hw_accel.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/pci/pci_device.h" #include "hw/s390x/s390-pci-inst.h" #include "hw/s390x/s390-pci-bus.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 64b81345f1e..29d95be2c64 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "system/confidential-guest-support.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/s390x/sclp.h" #include "hw/s390x/s390_flic.h" #include "virtio-ccw.h" diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index c9a9c4bb375..b9c3983df19 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -15,7 +15,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/memory.h" #include "hw/s390x/sclp.h" #include "hw/s390x/event-facility.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index c29ee690690..bccd40f5712 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -33,7 +33,7 @@ #include "system/reset.h" #include "system/runstate.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/pci/pci.h" #include "hw/qdev-properties.h" #include "net/net.h" diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 7558b2ad839..071c3b5e629 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -26,7 +26,7 @@ #include "qemu/uuid.h" #include "hw/firmware/smbios.h" #include "hw/loader.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_device.h" #include "smbios_build.h" diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 631c6113b5c..367beecf192 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -37,7 +37,7 @@ #include "system/system.h" #include "system/qtest.h" #include "system/reset.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "elf.h" #include "trace.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 53d7ae08ae9..b0d2d6f8bc8 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -40,7 +40,7 @@ #include "system/runstate.h" #include "system/system.h" #include "net/net.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/scsi/esp.h" #include "hw/nvram/sun_nvram.h" #include "hw/qdev-properties.h" diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 1ffe92060ad..334bec14ba3 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -26,7 +26,7 @@ #include "block/block_int-common.h" #include "qemu/units.h" #include "cpu.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "hw/misc/unimp.h" #include "hw/loader.h" diff --git a/hw/sparc64/sparc64.c b/hw/sparc64/sparc64.c index 9cffc92aa3b..ce7eded143b 100644 --- a/hw/sparc64/sparc64.c +++ b/hw/sparc64/sparc64.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/sparc/sparc64.h" #include "qemu/timer.h" #include "system/reset.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 82c3e7c855b..961d599f48d 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -46,7 +46,7 @@ #include "qemu/timer.h" #include "system/runstate.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/nvram/sun_nvram.h" #include "hw/nvram/chrp_nvram.h" #include "hw/sparc/sparc64.h" diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index 3facfdfd611..21b119712c5 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -23,7 +23,7 @@ #include "qapi/error.h" #include "cpu.h" #include "net/net.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "elf.h" #include "hw/tricore/tricore.h" diff --git a/hw/uefi/ovmf-log.c b/hw/uefi/ovmf-log.c index 850ef21f885..3a24afd9417 100644 --- a/hw/uefi/ovmf-log.c +++ b/hw/uefi/ovmf-log.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/target-info-qapi.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i386/x86.h" #include "hw/arm/virt.h" #include "system/dma.h" diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c index 4bfa2e0fcd2..cff413c16f5 100644 --- a/hw/vfio/igd.c +++ b/hw/vfio/igd.c @@ -15,7 +15,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/hw.h" #include "hw/nvram/fw_cfg.h" #include "pci.h" diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 02cdd807d77..bcf6ab64432 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -21,7 +21,7 @@ #include "hw/virtio/virtio.h" #include "hw/mem/pc-dimm.h" #include "hw/qdev-properties.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/balloon.h" #include "system/ramblock.h" #include "hw/virtio/virtio-balloon.h" diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c index 8123c6f83a3..dd4100033f1 100644 --- a/hw/virtio/virtio-iommu-pci.c +++ b/hw/virtio/virtio-iommu-pci.c @@ -16,7 +16,7 @@ #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qapi/error.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/pci/pci_bus.h" #include "qom/object.h" =20 diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index ae7c13e33cf..5d1d90edc52 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "migration/misc.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/acpi/acpi.h" #include "trace.h" diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 99cb30fe595..263e112a5cb 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -20,7 +20,7 @@ #include "exec/memop.h" #include "standard-headers/linux/virtio_pci.h" #include "standard-headers/linux/virtio_ids.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/virtio/virtio.h" #include "migration/qemu-file-types.h" #include "hw/pci/pci.h" diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index 62d33525bab..5da28cf72b2 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -25,7 +25,7 @@ #include "qemu/option.h" #include "qemu/units.h" #include "monitor/qdev.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/irq.h" #include "hw/loader.h" #include "hw/qdev-properties.h" diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index b40ae0b3af0..5d11b50db9c 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -11,7 +11,7 @@ #include "hw/pci/pci_host.h" #include "hw/xen/xen-hvm-common.h" #include "hw/xen/xen-bus.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/xen/arch_hvm.h" #include "system/memory.h" #include "system/runstate.h" diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index 5ed53f8943e..da9a8e5213a 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" =20 #include "hw/sysbus.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "qemu/main-loop.h" #include "qapi/error.h" diff --git a/hw/xen/xen-pvh-common.c b/hw/xen/xen-pvh-common.c index b93ff80c859..c3fc501fe6e 100644 --- a/hw/xen/xen-pvh-common.c +++ b/hw/xen/xen-pvh-common.c @@ -10,7 +10,7 @@ #include "qemu/error-report.h" #include "qemu/units.h" #include "qapi/visitor.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/irq.h" #include "system/tpm.h" #include "system/tpm_backend.h" diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 99c02492ef9..c406821c34c 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/xen/xen-legacy-backend.h" #include "hw/xen/xen-bus.h" #include "system/block-backend.h" diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index 49d17e7bb29..37acc562d21 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -29,7 +29,7 @@ #include "qapi/error.h" #include "system/reset.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "elf.h" #include "system/memory.h" diff --git a/hw/xtensa/virt.c b/hw/xtensa/virt.c index b10866ccd85..b9e324c2850 100644 --- a/hw/xtensa/virt.c +++ b/hw/xtensa/virt.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "system/reset.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/pci-host/gpex.h" #include "net/net.h" diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index db3b0155495..694456aa0a1 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -30,7 +30,7 @@ #include "qapi/error.h" #include "cpu.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/loader.h" #include "hw/qdev-properties.h" #include "elf.h" diff --git a/migration/migration.c b/migration/migration.c index b316ee01ab2..697f460c4aa 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -54,7 +54,7 @@ #include "io/channel-buffer.h" #include "io/channel-tls.h" #include "migration/colo.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "monitor/monitor.h" #include "net/announce.h" #include "qemu/queue.h" diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 7c9fe61041f..74e925af05a 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -30,7 +30,7 @@ #include "system/system.h" #include "qemu/error-report.h" #include "trace.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/ramblock.h" #include "socket.h" #include "yank_functions.h" diff --git a/migration/ram.c b/migration/ram.c index 29f016cb258..6b469238ad2 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -64,7 +64,7 @@ #include "system/dirtylimit.h" #include "system/kvm.h" =20 -#include "hw/boards.h" /* for machine_dump_guest_core() */ +#include "hw/core/boards.h" /* for machine_dump_guest_core() */ =20 #if defined(__linux__) #include "qemu/userfaultfd.h" diff --git a/migration/savevm.c b/migration/savevm.c index 62cc2ce25cb..73e185caf59 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -27,7 +27,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "net/net.h" #include "migration.h" #include "migration/snapshot.h" diff --git a/monitor/qemu-config-qmp.c b/monitor/qemu-config-qmp.c index 8bd28fc2328..29801023564 100644 --- a/monitor/qemu-config-qmp.c +++ b/monitor/qemu-config-qmp.c @@ -6,7 +6,7 @@ #include "qobject/qlist.h" #include "qemu/option.h" #include "qemu/config-file.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc = *desc) { diff --git a/plugins/api-system.c b/plugins/api-system.c index cc190b167ea..9a70b9caa6c 100644 --- a/plugins/api-system.c +++ b/plugins/api-system.c @@ -14,7 +14,7 @@ #include "qemu/main-loop.h" #include "qapi/error.h" #include "migration/blocker.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qemu/plugin-memory.h" #include "qemu/plugin.h" =20 diff --git a/plugins/system.c b/plugins/system.c index b3ecc33ba52..88ff60ee2b3 100644 --- a/plugins/system.c +++ b/plugins/system.c @@ -11,7 +11,7 @@ =20 #include "qemu/osdep.h" #include "qemu/plugin.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 #include "plugin.h" =20 diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index c5a07cb947b..2e9fa5842f6 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -48,7 +48,7 @@ #else #include "qemu/cutils.h" #include "hw/loader.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #endif =20 #define TARGET_SYS_OPEN 0x01 diff --git a/system/bootdevice.c b/system/bootdevice.c index 1845be4507e..8acdbfb0a57 100644 --- a/system/bootdevice.c +++ b/system/bootdevice.c @@ -29,7 +29,7 @@ #include "qemu/error-report.h" #include "system/reset.h" #include "hw/qdev-core.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 typedef struct FWBootEntry FWBootEntry; =20 diff --git a/system/cpus.c b/system/cpus.c index ef2d2f241fa..0b1eabd3c4b 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -44,7 +44,7 @@ #include "system/runstate.h" #include "system/cpu-timers.h" #include "system/whpx.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/hw.h" #include "trace.h" =20 diff --git a/system/device_tree.c b/system/device_tree.c index 7850b90fa72..3ccdf33374c 100644 --- a/system/device_tree.c +++ b/system/device_tree.c @@ -25,7 +25,7 @@ #include "qemu/guest-random.h" #include "system/device_tree.h" #include "hw/loader.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qemu/config-file.h" #include "qapi/qapi-commands-machine.h" #include "qobject/qdict.h" diff --git a/system/dirtylimit.c b/system/dirtylimit.c index b48c0d4b3da..a0c327533c3 100644 --- a/system/dirtylimit.c +++ b/system/dirtylimit.c @@ -21,7 +21,7 @@ #include "monitor/monitor.h" #include "system/memory.h" #include "exec/target_page.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/kvm.h" #include "trace.h" #include "migration/misc.h" diff --git a/system/memory.c b/system/memory.c index 8b84661ae36..b65219c2e49 100644 --- a/system/memory.c +++ b/system/memory.c @@ -32,7 +32,7 @@ #include "system/tcg.h" #include "qemu/accel.h" #include "accel/accel-ops.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "migration/vmstate.h" #include "system/address-spaces.h" =20 diff --git a/system/physmem.c b/system/physmem.c index c9869e4049f..edc384f4fa1 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -38,7 +38,7 @@ #include "exec/translation-block.h" #include "hw/qdev-core.h" #include "hw/qdev-properties.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/xen.h" #include "system/kvm.h" #include "system/tcg.h" diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index f2aa400a775..3babf81e330 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -42,7 +42,7 @@ #include "qemu/cutils.h" #include "hw/qdev-properties.h" #include "hw/clock.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 /* * Aliases were a bad idea from the start. Let's keep them diff --git a/system/runstate.c b/system/runstate.c index e3ec16ab74d..89bbfe7fbf9 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -31,7 +31,7 @@ #include "crypto/init.h" #include "exec/cpu-common.h" #include "gdbstub/syscalls.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/resettable.h" #include "migration/misc.h" #include "migration/postcopy-ram.h" diff --git a/target-info-stub.c b/target-info-stub.c index d96d8249c1d..8392d81e8f8 100644 --- a/target-info-stub.c +++ b/target-info-stub.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/target-info.h" #include "qemu/target-info-impl.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "cpu.h" =20 /* Validate correct placement of CPUArchState. */ diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c index d292c974c44..45df15de782 100644 --- a/target/arm/arm-qmp-cmds.c +++ b/target/arm/arm-qmp-cmds.c @@ -22,7 +22,7 @@ =20 #include "qemu/osdep.h" #include "qemu/target-info.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "kvm_arm.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 39292fb9bc1..7720d27a3c0 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -37,7 +37,7 @@ #include "hw/qdev-properties.h" #if !defined(CONFIG_USER_ONLY) #include "hw/loader.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #ifdef CONFIG_TCG #include "hw/intc/armv7m_nvic.h" #endif /* CONFIG_TCG */ diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index de1e8fb8a05..93806fa8005 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -25,7 +25,7 @@ =20 #include "system/address-spaces.h" #include "system/memory.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/irq.h" #include "qemu/main-loop.h" #include "system/cpus.h" diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 0d57081e69f..c7ea6fc2f62 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -33,7 +33,7 @@ #include "exec/memattrs.h" #include "system/address-spaces.h" #include "gdbstub/enums.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/irq.h" #include "qapi/visitor.h" #include "qemu/log.h" diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index f0761410ad0..0b0bc96bac2 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -14,7 +14,7 @@ #include "internals.h" #include "target/arm/idau.h" #if !defined(CONFIG_USER_ONLY) -#include "hw/boards.h" +#include "hw/core/boards.h" #endif #include "cpregs.h" =20 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 64177757863..4216ca9ec1d 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -42,7 +42,7 @@ #include "system/reset.h" #include "qapi/qapi-commands-machine.h" #include "system/address-spaces.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i386/sgx-epc.h" #endif #include "system/qtest.h" diff --git a/target/i386/hvf/hvf-cpu.c b/target/i386/hvf/hvf-cpu.c index 94ee096ecf7..316c1b0ba07 100644 --- a/target/i386/hvf/hvf-cpu.c +++ b/target/i386/hvf/hvf-cpu.c @@ -12,7 +12,7 @@ #include "host-cpu.h" #include "qapi/error.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/hvf.h" #include "accel/accel-cpu-target.h" #include "hvf-i386.h" diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c index 9c25b558395..33a8c26bc27 100644 --- a/target/i386/kvm/kvm-cpu.c +++ b/target/i386/kvm/kvm-cpu.c @@ -12,7 +12,7 @@ #include "host-cpu.h" #include "qapi/error.h" #include "system/system.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/i386/x86.h" =20 #include "kvm_i386.h" diff --git a/target/i386/kvm/vmsr_energy.c b/target/i386/kvm/vmsr_energy.c index 890322ae372..d24e827a214 100644 --- a/target/i386/kvm/vmsr_energy.c +++ b/target/i386/kvm/vmsr_energy.c @@ -16,7 +16,7 @@ #include "vmsr_energy.h" #include "io/channel.h" #include "io/channel-socket.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "cpu.h" #include "host-cpu.h" =20 diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 6bf8d5f4bbb..db184e1b0d0 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -19,7 +19,7 @@ #include "system/cpus.h" #include "system/runstate.h" #include "qemu/main-loop.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/intc/ioapic.h" #include "hw/i386/apic_internal.h" #include "qemu/error-report.h" diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c index 26e40c9bdc0..6412584e1bd 100644 --- a/target/loongarch/kvm/kvm.c +++ b/target/loongarch/kvm/kvm.c @@ -19,7 +19,7 @@ #include "hw/pci/pci.h" #include "exec/memattrs.h" #include "system/address-spaces.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/irq.h" #include "hw/loongarch/virt.h" #include "qemu/log.h" diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c index 6fbbd140f32..578a08dfee8 100644 --- a/target/m68k/m68k-semi.c +++ b/target/m68k/m68k-semi.c @@ -28,7 +28,7 @@ #include "gdbstub/helpers.h" #include "semihosting/syscalls.h" #include "semihosting/uaccess.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "qemu/log.h" =20 #define HOSTED_EXIT 0 diff --git a/target/mips/kvm.c b/target/mips/kvm.c index 912cd5dfa0e..a85e162409c 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -22,7 +22,7 @@ #include "system/kvm_int.h" #include "system/runstate.h" #include "kvm_mips.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "fpu_helper.h" =20 #define DEBUG_KVM 0 diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index 7ad908b6322..ca627bd7194 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -25,7 +25,7 @@ #include "exec/helper-proto.h" #include "exception.h" #ifndef CONFIG_USER_ONLY -#include "hw/boards.h" +#include "hw/core/boards.h" #endif #include "tcg/insn-start-words.h" =20 diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 86ead740eec..a3b14cceada 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -46,7 +46,7 @@ #include "spr_common.h" #include "power8-pmu.h" #ifndef CONFIG_USER_ONLY -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/intc/intc.h" #include "kvm_ppc.h" #endif diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 47e672c7aac..301d8de67fd 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -37,7 +37,7 @@ #include "exec/memattrs.h" #include "system/address-spaces.h" #include "system/memory.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/irq.h" #include "hw/intc/riscv_imsic.h" #include "qemu/log.h" diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index d3968251fad..bb03f8dc0ca 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -34,7 +34,7 @@ #include "accel/tcg/cpu-ops.h" #include "tcg/tcg.h" #ifndef CONFIG_USER_ONLY -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/tcg.h" #include "exec/icount.h" #endif diff --git a/target/s390x/cpu-system.c b/target/s390x/cpu-system.c index f3a9ffb2a27..c7a6fd7e751 100644 --- a/target/s390x/cpu-system.c +++ b/target/s390x/cpu-system.c @@ -34,7 +34,7 @@ #include "system/hw_accel.h" =20 #include "target/s390x/kvm/pv.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/system.h" #include "system/tcg.h" #include "hw/core/sysemu-cpu-ops.h" diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 3b1e75f7833..7a7b3810590 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -28,7 +28,7 @@ #include "exec/target_page.h" #include "hw/hw.h" #include "hw/s390x/storage-keys.h" -#include "hw/boards.h" +#include "hw/core/boards.h" =20 /* Fetch/store bits in the translation exception code: */ #define FS_READ 0x800 diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c index f5d7bc0fa22..b6d44c5c31b 100644 --- a/target/s390x/sigp.c +++ b/target/s390x/sigp.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "s390x-internal.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "system/hw_accel.h" #include "system/memory.h" #include "system/runstate.h" diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c index c6641280bc6..54f051ae9e1 100644 --- a/target/s390x/tcg/excp_helper.c +++ b/target/s390x/tcg/excp_helper.c @@ -33,7 +33,7 @@ #include "system/memory.h" #include "hw/s390x/ioinst.h" #include "hw/s390x/s390_flic.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #endif #include "qemu/plugin.h" =20 diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 24675fc818d..9e5bd3ed07f 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -40,7 +40,7 @@ #include "user/page-protection.h" #else #include "hw/s390x/storage-keys.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #endif =20 #ifdef CONFIG_USER_ONLY diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c index 215b5b9d933..1fd900fbbf0 100644 --- a/target/s390x/tcg/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -42,7 +42,7 @@ #include "hw/s390x/s390_flic.h" #include "hw/s390x/ioinst.h" #include "hw/s390x/s390-pci-inst.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "hw/s390x/tod.h" #include CONFIG_DEVICES #endif diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuz= z.c index f12080eda49..c848eec3b93 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -25,7 +25,7 @@ #include "hw/qdev-core.h" #include "hw/pci/pci.h" #include "hw/pci/pci_device.h" -#include "hw/boards.h" +#include "hw/core/boards.h" #include "generic_fuzz_configs.h" #include "hw/mem/sparse-mem.h" =20 diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 326045ecbb3..28ea9158e7a 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -15,7 +15,7 @@ #include "qemu/module.h" #include "qapi/error.h" =20 -#include "hw/boards.h" +#include "hw/core/boards.h" =20 #define T true #define F false diff --git a/scripts/compare-machine-types.py b/scripts/compare-machine-typ= es.py index 2af3995eb82..b4f899082a7 100755 --- a/scripts/compare-machine-types.py +++ b/scripts/compare-machine-types.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Script to compare machine type compatible properties (include/hw/boards.= h). +# Script to compare machine type compatible properties (include/hw/core/bo= ards.h). # compat_props are applied to the driver during initialization to change # default values, for instance, to maintain compatibility. # This script constructs table with machines and values of their compat_pr= ops --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764252520; cv=none; d=zohomail.com; s=zohoarc; b=AVY15dfrdnRoPpIzh6Qh+C1koPryEq6NMIcH95dINQtdj+/P+IWQD+ODqPrVcZG+PJXQId5V89rbhBBvtu4H8d33azEZNcKNkqqX8cFubJPW+MmcJ/mkWYeE6OFU/eCfn7qlCwYWJPEaFkG4bGWtBqAk8Y8l5nrGxgrmQY/okHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764252520; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=D6q5/fA9ZBQN51KybDjDnBCFEP4bAPfWkdyioZykSiY=; b=LXeP2TTsg/t6ePlit1C1uIv8gZgnjIAu3rpIQbrTlqYJqRMgU9jSXIl//cLyxWOmgrXmwQ7eTTeVS7zovfw0NIBep1D19tDkFBpIGFPwxuB0XE5Z6KeGGMx37u0NBUFwTHUFnR2c8Cc6yZi6L20QQ3DSmPbotVDwotEqrdJgpII= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764252520172310.5576079444726; Thu, 27 Nov 2025 06:08:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObqX-0002Zy-1L; Thu, 27 Nov 2025 08:15:41 -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 1vObqR-0002ZC-Os for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:36 -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 1vObqP-0001CY-GA for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:35 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-218-6JTrkZKbMzqc_Lc0b8NDNw-1; Thu, 27 Nov 2025 08:15:31 -0500 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-b73586b1195so85329666b.3 for ; Thu, 27 Nov 2025 05:15:31 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f59aea78sm151922266b.36.2025.11.27.05.15.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D6q5/fA9ZBQN51KybDjDnBCFEP4bAPfWkdyioZykSiY=; b=D9G3x5Skzhai5p6j5XFamQEXQlbIJfpJojcOu2j76ulf1a4eCg/zZ8f3Ob/yK1QBupNHbW AiSzOE7f6GiCAGqhPgNSTwfesMZ0kl+CoAQCXBXY9nz/5jfmZsMgiyTydAd8qgAFecVRGg dpf+IxSfbQuT67iY60CYntcJidvlX48= X-MC-Unique: 6JTrkZKbMzqc_Lc0b8NDNw-1 X-Mimecast-MFC-AGG-ID: 6JTrkZKbMzqc_Lc0b8NDNw_1764249330 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249330; x=1764854130; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=D6q5/fA9ZBQN51KybDjDnBCFEP4bAPfWkdyioZykSiY=; b=dnApProBnhovVSFrkUo67iTOcZH7WsHd3Emv6nM38a7oue7Xc701EGofNhyFfZfljq baX59bYFWThdJyvHL79EMG8ZK5bpcL7qIokwpHtzRMeZL2Dhk2ek+tu+Pf7A/ZtyXfrB 11UMYKLfK3jnq03tVF7QYWjuS2UAxyPs9qeR68/4FBWH+dL99nnUKG4C1SberZPbi1x7 SaNHMaH+0qhkX8Ae7XQ8DUnPP9vh/JFC705q3oNoKEjW25ZGm1kFEAEEYsCtkJPrWWuM ueJLRZkBdN8OSHemEpJniiOy+FZIpmoECRH1jPtkiru6P2OSIwwYdd1ZUc7iTaxWRE5v kwWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249330; x=1764854130; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=D6q5/fA9ZBQN51KybDjDnBCFEP4bAPfWkdyioZykSiY=; b=Q7ZjEIdLeXiazB0b0QlaH1/5Te7KbQIYczusbk2bctGQzdrIGdhAQAoyou6vT74alb 7GUKW5pokvB3S4HPqQobm6VhVPGvpnhNTQ2P6UzddqGe4GOn2RABXK5yrRygpEyFQ3vy JrY7SxDUIoi1WGeixHpn50q2G27dnViK/O6OPgenVjK/dLPdh+ytU1HMjSn0SBlDsepe jJk2S1hka7n3Nt4QaGFX5LfeaHgzAL9wdaBBUxMG2HAcEpmI3SvJQ80OgmMa0TiNvde2 nnW8k8/+Msff2lhJTx4hOkGIxCdFV0O2kETUCKNcL1NhovCR873USfJqUDp20HeZMXsN ME7Q== X-Gm-Message-State: AOJu0Yy1oL0iWhh6t+phPMzikWhPTMvRUf1CTaRsymhffkpO03FXVR0C g6mk4sbzjZE/MAo1AWiMPWV6T6AZ0Mx+OpLDXWEKy5AlLw8mG4W2+yFwAyAYTyZCF1Rkkp+PlpV xF64I8Ib0OYeXQEJd2c/m/vO+jfxGB1240bIIrYYESfIOPZr1yHtQwNQp3f/kcuwdYWYmn1UlL8 2M5wGNyr0cVlcV5tZ1+qjqPyfCdonTONVM+bLQ6kWO X-Gm-Gg: ASbGnctzi/bhT0K5jL2Dl/Ni7VcSK6hWM6SwqdHYsRLhvpQ7lfYCrU+C5w/hGsw/vxs vlFMQv35N9X+9q44k1bQTvSWDALcJ6pfJmAVEaW/LW84zr1zhzOws8DOPRD+JqCUbKWk2xcuC0g SfQCzQqdxTQ1RADt9kCzZPOXrHOpDvbToNm+wlgAAkEsrCxzzPrl4lPmb6UgZ+7mN9gQX74Io2M I63YWwZyYOVUmRQruOHggKQ3ArGcgXC6zPX8gp2mJmTaRNsetRDBNdKBvvTiPkiuqwl62mybrGb vWQvKvoxOftUac/pLy2XoB7enbr0mXDxFb3J3nXffxARvdUStUWJwnRHAnjVzqr5+1BYxP6KM9R An6Yxb/ws9XfcgNsuVrZRlTEJIN8RGIrpkTZgw2woF8P/4Pz9oDJ55sVFJ7zp1dR1lIOsUyX4TV uk6LcIxx8RDXaRZgg= X-Received: by 2002:a17:907:3c87:b0:b76:c0af:779f with SMTP id a640c23a62f3a-b76c0af791bmr1281824466b.43.1764249329540; Thu, 27 Nov 2025 05:15:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IG6O/M+73/PLICojniAf2YPTo3iZnuzRQ4yktbfrw038jrNsrQlVhA40kWVOyYumcYkaJuwQA== X-Received: by 2002:a17:907:3c87:b0:b76:c0af:779f with SMTP id a640c23a62f3a-b76c0af791bmr1281817166b.43.1764249328754; Thu, 27 Nov 2025 05:15:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 06/28] include: move hw/clock.h to hw/core/ Date: Thu, 27 Nov 2025 14:14:53 +0100 Message-ID: <20251127131516.80807-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764252522701019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- MAINTAINERS | 2 +- docs/devel/clocks.rst | 2 +- include/hw/adc/npcm7xx_adc.h | 2 +- include/hw/arm/armsse.h | 2 +- include/hw/arm/armv7m.h | 2 +- include/hw/arm/msf2-soc.h | 2 +- include/hw/arm/nrf51_soc.h | 2 +- include/hw/arm/stm32f100_soc.h | 2 +- include/hw/arm/stm32f205_soc.h | 2 +- include/hw/{ =3D> core}/clock.h | 0 include/hw/mips/cps.h | 2 +- include/hw/misc/npcm7xx_mft.h | 2 +- include/hw/misc/npcm7xx_pwm.h | 2 +- include/hw/misc/npcm_clk.h | 2 +- include/hw/qdev-clock.h | 2 +- include/hw/timer/armv7m_systick.h | 2 +- include/hw/timer/cmsdk-apb-dualtimer.h | 2 +- include/hw/timer/cmsdk-apb-timer.h | 2 +- include/hw/timer/stellaris-gptm.h | 2 +- include/hw/watchdog/cmsdk-apb-watchdog.h | 2 +- rust/hw/core/wrapper.h | 2 +- target/mips/cpu.h | 2 +- target/xtensa/cpu.h | 2 +- hw/char/stm32l4x5_usart.c | 2 +- hw/core/clock-vmstate.c | 2 +- hw/core/clock.c | 2 +- hw/core/ptimer.c | 2 +- hw/gpio/stm32l4x5_gpio.c | 2 +- hw/mips/fuloong2e.c | 2 +- hw/mips/jazz.c | 2 +- hw/mips/malta.c | 2 +- hw/misc/stm32l4x5_rcc.c | 2 +- hw/misc/stm32l4x5_syscfg.c | 2 +- hw/timer/sse-counter.c | 2 +- hw/timer/sse-timer.c | 2 +- system/qdev-monitor.c | 2 +- 36 files changed, 35 insertions(+), 35 deletions(-) rename include/hw/{ =3D> core}/clock.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 4c3cfbc81a4..c464e7b5ea8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3951,7 +3951,7 @@ Clock framework M: Luc Michel R: Damien Hedde S: Maintained -F: include/hw/clock.h +F: include/hw/core/clock.h F: include/hw/qdev-clock.h F: hw/core/clock.c F: hw/core/clock-vmstate.c diff --git a/docs/devel/clocks.rst b/docs/devel/clocks.rst index 3f744f2be1e..2dbdc668606 100644 --- a/docs/devel/clocks.rst +++ b/docs/devel/clocks.rst @@ -46,7 +46,7 @@ Here is an example of clocks:: | +-------+ | +--------------+ =20 -Clocks are defined in the ``include/hw/clock.h`` header and device +Clocks are defined in the ``include/hw/core/clock.h`` header and device related functions are defined in the ``include/hw/qdev-clock.h`` header. =20 diff --git a/include/hw/adc/npcm7xx_adc.h b/include/hw/adc/npcm7xx_adc.h index 93330a408d2..a0c56d42365 100644 --- a/include/hw/adc/npcm7xx_adc.h +++ b/include/hw/adc/npcm7xx_adc.h @@ -16,7 +16,7 @@ #ifndef NPCM7XX_ADC_H #define NPCM7XX_ADC_H =20 -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/timer.h" diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h index 88b3b759c5a..04755ed1ec3 100644 --- a/include/hw/arm/armsse.h +++ b/include/hw/arm/armsse.h @@ -110,7 +110,7 @@ #include "hw/misc/armsse-cpu-pwrctrl.h" #include "hw/misc/unimp.h" #include "hw/or-irq.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/core/split-irq.h" #include "hw/cpu/cluster.h" #include "qom/object.h" diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h index 5c057ab2ec9..e31888cc8cd 100644 --- a/include/hw/arm/armv7m.h +++ b/include/hw/arm/armv7m.h @@ -15,7 +15,7 @@ #include "hw/misc/armv7m_ras.h" #include "target/arm/idau.h" #include "qom/object.h" -#include "hw/clock.h" +#include "hw/core/clock.h" =20 #define TYPE_BITBAND "ARM-bitband-memory" OBJECT_DECLARE_SIMPLE_TYPE(BitBandState, BITBAND) diff --git a/include/hw/arm/msf2-soc.h b/include/hw/arm/msf2-soc.h index 9300664e8ea..510a91cd771 100644 --- a/include/hw/arm/msf2-soc.h +++ b/include/hw/arm/msf2-soc.h @@ -30,7 +30,7 @@ #include "hw/misc/msf2-sysreg.h" #include "hw/ssi/mss-spi.h" #include "hw/net/msf2-emac.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "qom/object.h" =20 #define TYPE_MSF2_SOC "msf2-soc" diff --git a/include/hw/arm/nrf51_soc.h b/include/hw/arm/nrf51_soc.h index f88ab1b7d3e..94d7fc62ac4 100644 --- a/include/hw/arm/nrf51_soc.h +++ b/include/hw/arm/nrf51_soc.h @@ -17,7 +17,7 @@ #include "hw/gpio/nrf51_gpio.h" #include "hw/nvram/nrf51_nvm.h" #include "hw/timer/nrf51_timer.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "qom/object.h" =20 #define TYPE_NRF51_SOC "nrf51-soc" diff --git a/include/hw/arm/stm32f100_soc.h b/include/hw/arm/stm32f100_soc.h index a74d7b369c1..4c113d67748 100644 --- a/include/hw/arm/stm32f100_soc.h +++ b/include/hw/arm/stm32f100_soc.h @@ -29,7 +29,7 @@ #include "hw/ssi/stm32f2xx_spi.h" #include "hw/arm/armv7m.h" #include "qom/object.h" -#include "hw/clock.h" +#include "hw/core/clock.h" =20 #define TYPE_STM32F100_SOC "stm32f100-soc" OBJECT_DECLARE_SIMPLE_TYPE(STM32F100State, STM32F100_SOC) diff --git a/include/hw/arm/stm32f205_soc.h b/include/hw/arm/stm32f205_soc.h index 46eda3403a9..d3de6b94dab 100644 --- a/include/hw/arm/stm32f205_soc.h +++ b/include/hw/arm/stm32f205_soc.h @@ -32,7 +32,7 @@ #include "hw/or-irq.h" #include "hw/ssi/stm32f2xx_spi.h" #include "hw/arm/armv7m.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "qom/object.h" =20 #define TYPE_STM32F205_SOC "stm32f205-soc" diff --git a/include/hw/clock.h b/include/hw/core/clock.h similarity index 100% rename from include/hw/clock.h rename to include/hw/core/clock.h diff --git a/include/hw/mips/cps.h b/include/hw/mips/cps.h index 05ef9f76b74..e7309841d08 100644 --- a/include/hw/mips/cps.h +++ b/include/hw/mips/cps.h @@ -21,7 +21,7 @@ #define MIPS_CPS_H =20 #include "hw/sysbus.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/misc/mips_cmgcr.h" #include "hw/intc/mips_gic.h" #include "hw/misc/mips_cpc.h" diff --git a/include/hw/misc/npcm7xx_mft.h b/include/hw/misc/npcm7xx_mft.h index e4b997a6ad3..54a2c2a82e6 100644 --- a/include/hw/misc/npcm7xx_mft.h +++ b/include/hw/misc/npcm7xx_mft.h @@ -17,7 +17,7 @@ #define NPCM7XX_MFT_H =20 #include "system/memory.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "qom/object.h" diff --git a/include/hw/misc/npcm7xx_pwm.h b/include/hw/misc/npcm7xx_pwm.h index df927266209..f697a77cdca 100644 --- a/include/hw/misc/npcm7xx_pwm.h +++ b/include/hw/misc/npcm7xx_pwm.h @@ -16,7 +16,7 @@ #ifndef NPCM7XX_PWM_H #define NPCM7XX_PWM_H =20 -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/sysbus.h" #include "hw/irq.h" =20 diff --git a/include/hw/misc/npcm_clk.h b/include/hw/misc/npcm_clk.h index 52e972f4604..50b93a0094d 100644 --- a/include/hw/misc/npcm_clk.h +++ b/include/hw/misc/npcm_clk.h @@ -17,7 +17,7 @@ #define NPCM_CLK_H =20 #include "system/memory.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/sysbus.h" =20 #define NPCM7XX_CLK_NR_REGS (0x70 / sizeof(uint32_t)) diff --git a/include/hw/qdev-clock.h b/include/hw/qdev-clock.h index ffa0f7ba09e..af0d8499a67 100644 --- a/include/hw/qdev-clock.h +++ b/include/hw/qdev-clock.h @@ -14,7 +14,7 @@ #ifndef QDEV_CLOCK_H #define QDEV_CLOCK_H =20 -#include "hw/clock.h" +#include "hw/core/clock.h" =20 /** * qdev_init_clock_in: diff --git a/include/hw/timer/armv7m_systick.h b/include/hw/timer/armv7m_sy= stick.h index ee09b138810..ac7de0a43ef 100644 --- a/include/hw/timer/armv7m_systick.h +++ b/include/hw/timer/armv7m_systick.h @@ -15,7 +15,7 @@ #include "hw/sysbus.h" #include "qom/object.h" #include "hw/ptimer.h" -#include "hw/clock.h" +#include "hw/core/clock.h" =20 #define TYPE_SYSTICK "armv7m_systick" =20 diff --git a/include/hw/timer/cmsdk-apb-dualtimer.h b/include/hw/timer/cmsd= k-apb-dualtimer.h index f3ec86c00b5..f098128a588 100644 --- a/include/hw/timer/cmsdk-apb-dualtimer.h +++ b/include/hw/timer/cmsdk-apb-dualtimer.h @@ -28,7 +28,7 @@ =20 #include "hw/sysbus.h" #include "hw/ptimer.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "qom/object.h" =20 #define TYPE_CMSDK_APB_DUALTIMER "cmsdk-apb-dualtimer" diff --git a/include/hw/timer/cmsdk-apb-timer.h b/include/hw/timer/cmsdk-ap= b-timer.h index 2dd615d1be9..74eaf611aeb 100644 --- a/include/hw/timer/cmsdk-apb-timer.h +++ b/include/hw/timer/cmsdk-apb-timer.h @@ -14,7 +14,7 @@ =20 #include "hw/sysbus.h" #include "hw/ptimer.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "qom/object.h" =20 #define TYPE_CMSDK_APB_TIMER "cmsdk-apb-timer" diff --git a/include/hw/timer/stellaris-gptm.h b/include/hw/timer/stellaris= -gptm.h index fde1fc6f0c7..c705508b829 100644 --- a/include/hw/timer/stellaris-gptm.h +++ b/include/hw/timer/stellaris-gptm.h @@ -13,7 +13,7 @@ #include "qom/object.h" #include "hw/sysbus.h" #include "hw/irq.h" -#include "hw/clock.h" +#include "hw/core/clock.h" =20 #define TYPE_STELLARIS_GPTM "stellaris-gptm" OBJECT_DECLARE_SIMPLE_TYPE(gptm_state, STELLARIS_GPTM) diff --git a/include/hw/watchdog/cmsdk-apb-watchdog.h b/include/hw/watchdog= /cmsdk-apb-watchdog.h index c6b3e78731e..5bbf4979c9f 100644 --- a/include/hw/watchdog/cmsdk-apb-watchdog.h +++ b/include/hw/watchdog/cmsdk-apb-watchdog.h @@ -33,7 +33,7 @@ =20 #include "hw/sysbus.h" #include "hw/ptimer.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "qom/object.h" =20 #define TYPE_CMSDK_APB_WATCHDOG "cmsdk-apb-watchdog" diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h index 3bdbd1249e4..77b541f83f9 100644 --- a/rust/hw/core/wrapper.h +++ b/rust/hw/core/wrapper.h @@ -25,7 +25,7 @@ typedef enum memory_order { #include "qemu/osdep.h" =20 #include "hw/sysbus.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 5cd4c6c818d..ed662135cb0 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -9,7 +9,7 @@ #include "system/memory.h" #endif #include "fpu/softfloat-types.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "mips-defs.h" =20 typedef struct CPUMIPSTLBContext CPUMIPSTLBContext; diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 74122ebe15c..22192924841 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -33,7 +33,7 @@ #include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "xtensa-isa.h" =20 enum { diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c index afbe4bab29d..60d8ab5a0e5 100644 --- a/hw/char/stm32l4x5_usart.c +++ b/hw/char/stm32l4x5_usart.c @@ -23,7 +23,7 @@ #include "chardev/char-serial.h" #include "migration/vmstate.h" #include "hw/char/stm32l4x5_usart.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" diff --git a/hw/core/clock-vmstate.c b/hw/core/clock-vmstate.c index e831fc596f8..9566d04cc64 100644 --- a/hw/core/clock-vmstate.c +++ b/hw/core/clock-vmstate.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "migration/vmstate.h" -#include "hw/clock.h" +#include "hw/core/clock.h" =20 static bool muldiv_needed(void *opaque) { diff --git a/hw/core/clock.c b/hw/core/clock.c index 9c906761e19..3fc98a0c65d 100644 --- a/hw/core/clock.c +++ b/hw/core/clock.c @@ -15,7 +15,7 @@ #include "qemu/cutils.h" #include "qapi/visitor.h" #include "system/qtest.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "trace.h" =20 #define CLOCK_PATH(_clk) (_clk->canonical_path) diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index 0aeb10fb53e..a7337f02b8d 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -14,7 +14,7 @@ #include "exec/icount.h" #include "system/qtest.h" #include "block/aio.h" -#include "hw/clock.h" +#include "hw/core/clock.h" =20 #define DELTA_ADJUST 1 #define DELTA_NO_ADJUST -1 diff --git a/hw/gpio/stm32l4x5_gpio.c b/hw/gpio/stm32l4x5_gpio.c index 414ce830390..42fe984c493 100644 --- a/hw/gpio/stm32l4x5_gpio.c +++ b/hw/gpio/stm32l4x5_gpio.c @@ -20,7 +20,7 @@ #include "qemu/log.h" #include "hw/gpio/stm32l4x5_gpio.h" #include "hw/irq.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "qapi/visitor.h" diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index e777863703d..fa252c4b285 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -23,7 +23,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "net/net.h" #include "hw/core/boards.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 1708cec3f8c..fdcae4ce90e 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "qemu/datadir.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/mips/mips.h" #include "hw/intc/i8259.h" #include "hw/dma/i8257.h" diff --git a/hw/mips/malta.c b/hw/mips/malta.c index f39e56d2798..44ae8bc6c72 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -29,7 +29,7 @@ #include "qemu/cutils.h" #include "qemu/guest-random.h" #include "exec/tswap.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/southbridge/piix.h" #include "hw/isa/superio.h" #include "hw/char/serial-mm.h" diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c index 0e1f27fbdda..514159777a0 100644 --- a/hw/misc/stm32l4x5_rcc.c +++ b/hw/misc/stm32l4x5_rcc.c @@ -23,7 +23,7 @@ #include "migration/vmstate.h" #include "hw/misc/stm32l4x5_rcc.h" #include "hw/misc/stm32l4x5_rcc_internals.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" diff --git a/hw/misc/stm32l4x5_syscfg.c b/hw/misc/stm32l4x5_syscfg.c index 4e21756e0b4..85be226d2f4 100644 --- a/hw/misc/stm32l4x5_syscfg.c +++ b/hw/misc/stm32l4x5_syscfg.c @@ -26,7 +26,7 @@ #include "trace.h" #include "hw/irq.h" #include "migration/vmstate.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/qdev-clock.h" #include "qapi/error.h" #include "hw/misc/stm32l4x5_syscfg.h" diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c index 31f77acf61e..bb364e815be 100644 --- a/hw/timer/sse-counter.c +++ b/hw/timer/sse-counter.c @@ -34,7 +34,7 @@ #include "hw/timer/sse-counter.h" #include "hw/sysbus.h" #include "hw/registerfields.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/qdev-clock.h" #include "migration/vmstate.h" =20 diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c index 866d5eef8af..c5fd038162b 100644 --- a/hw/timer/sse-timer.c +++ b/hw/timer/sse-timer.c @@ -43,7 +43,7 @@ #include "hw/sysbus.h" #include "hw/irq.h" #include "hw/registerfields.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 3babf81e330..c8773d864d9 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -41,7 +41,7 @@ #include "migration/misc.h" #include "qemu/cutils.h" #include "hw/qdev-properties.h" -#include "hw/clock.h" +#include "hw/core/clock.h" #include "hw/core/boards.h" =20 /* --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764251389; cv=none; d=zohomail.com; s=zohoarc; b=SDHKSUsJ+8tGZ7Sf5+rvh3yztqRnHQbRTIEhSv4fS3K6iZ5JATVurV2ue62YfVYmYdOJg7oAvJstgSCOL97Xt7DZCJkCiWTdftQ3kkj77Oug3ZUNODGOSP/oUP9MWvbCrqc9Jt4M3/2/SqiPunjuFmLVi5FyeXNcB4p//bsxPHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764251389; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=AVhaavhb2GPoBraNf9DUEEmc85CVGAd40biEW+z/h1w=; b=QaL99AhPPiGKZe/sl+TvTSysOtMJkvyOBbkhhETCq8RWknMdQcrfcGRJu53ZyY7ylcLDfWnTauXPaiOzeJQW6cwOTRXtLhGtgCIcjxae+U8SsbY15YcoD4ZseGygqLlIPjSVLcRJM+a8aYVBv29hgd760y5Z+sWiLnrZ7O6JKKY= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764251389980643.7136729764258; Thu, 27 Nov 2025 05:49:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObqZ-0002b9-Cq; Thu, 27 Nov 2025 08:15:43 -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 1vObqT-0002ZR-5F for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vObqR-0001Cu-90 for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:36 -0500 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-17-EilB7tNpNFCLtfxxjwedZA-1; Thu, 27 Nov 2025 08:15:32 -0500 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-b7336ad128cso83585566b.1 for ; Thu, 27 Nov 2025 05:15:32 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f59aed2esm159140266b.42.2025.11.27.05.15.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AVhaavhb2GPoBraNf9DUEEmc85CVGAd40biEW+z/h1w=; b=ZpIAwOykf8qzi5WDCJCPPheN18VsgjZFGNCfAnSjYu4f5sn1u4RMR4yxgxWH0EuNxA73ee vSecThN+TLyNOmYA2ZPmuB2pX48P0276btQI6e5fW0US2frVnEsKJWcagI0Rpn7P73sOlA y7smDe6edpRqUI9RpaLuCtuR341WPc4= X-MC-Unique: EilB7tNpNFCLtfxxjwedZA-1 X-Mimecast-MFC-AGG-ID: EilB7tNpNFCLtfxxjwedZA_1764249332 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249331; x=1764854131; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AVhaavhb2GPoBraNf9DUEEmc85CVGAd40biEW+z/h1w=; b=bPFnO/Dqo0lyJ+WTdztzH4GCeu2WPy5qRma+35Id3j7CvSczRnQWSXfIqaMcIeF9gS Cjt0bAG0sasJZeVXtiWk8OrqRzKDTdqiON+TNUDasCUKFeY6pgUNSwmjbHULN/DJYMmW oe+RhCLvqkguUNcKS+pi33NWL5fRHfVslgN99xBubu/wmiiWs5yIdaUk2ORb377YvoZP lxRcz3JIqPCzXDnIuhHEppcupJWfvTJOmWgrOz3vq0bAH2ZixithznZ9hc47Ey+mz8YO 463uBu+Pmxmat6H5sETPlFP8/p+wiCS0IFX/fSDlTFfbPZgG7R4E0yfQaiuNLmmUE7Wf ZlSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249331; x=1764854131; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=AVhaavhb2GPoBraNf9DUEEmc85CVGAd40biEW+z/h1w=; b=kHGWDvTuM0JUblQxb4yRGVzNxe9F9o2/svzGU0JmEEg7RMLcrf/6EeqXUB577xwMP9 DDtV8JoOOk8iDKHhdqkToifTNwXI9iAbfQlLohdXQt9gHddyWeO/oEe0q9rcq1xJRvbG xexG4bKIH3szTOmteOSNoggJDTpKVIJ8vVnaI7okARgsrtlPgCDXnCC8egjGgUDYhuYT iuT49NqboWAZfcgtcyqYT5xpl52Oj8CkaJy89FHI7jm7svOFiuX7hIjzHs5je+xo7aJJ cZ4SWY7asT2rA0IIij4XtHQVkJvvbYm3KpTzyzC1kegSs8LaC+AH7l7/ffMoWn59OiEh h77Q== X-Gm-Message-State: AOJu0YwISNlOdDhodlEfdrKeNOUTX6v+LNoRlfEjRlbc84bo8T1C2JzN Llh0U8HUR9efRdnctkkhjBcOcXb5pM8GtuNIudc12f37URTJbQTK/UZ6XyPZP7K3K9hOpPrqqXR YZUYpdA9Y0xhhDp9XuS99/FFvNinHuGwDZKnV5b/6HYvMaelReAqhKJZztEHChUZ1Iy2B0KA1TN sdZsOUmWTHQRvPHMZzCgq/+UiP0j+yHLSAxMPaZfWm X-Gm-Gg: ASbGncu+d4/ofGp2FCczO0PDB01K3P7pLBVopjyFGGUl0FGq2r9FPurNfkZRVh6w3bz JDCJ5iyLODMXaxvO5Oi7gcsr5mD1P43j6W7qqKrHB1R6n/atA7cXHPpuQcrqcxIMYKuax+a7G31 Ciojn8jLbfssxyU8d94crLwJRrglkpvNoduUU74aqpiIF37v8PK8AKnid4waSSs2RONLuaCicwX UpVwxG1h3JsgiSozfVRZR/3KvtAWnfv/GcCOuqOZGFwSRcWi/LiCUKVZnIkqJZNQCROGPzmQyc7 lx/9v7SJg4oqx5Mi/uJ6ua9rOj2oHi2qwNNS3YS27nDcZSPvDWBCVqucl6vUSPlQJiDgBupXS7u dgKe6EPIKRfrxDfs1Wsujw6Vuq6cjCO5JVjPHbjW05pT8n6/cxfU0KOCTN2JmVaC8bKWqPlO6p/ skIyip7TXviaNfKkI= X-Received: by 2002:a17:907:1b12:b0:b76:7e0e:4246 with SMTP id a640c23a62f3a-b76c546da56mr1165980266b.12.1764249330708; Thu, 27 Nov 2025 05:15:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IHb7zuvFVDfBZw913/shAVEqGxBXfvMcd4GyLcmQ1qqjnS3/+uV6HknX9zw/NBNxTVFYU4Xcg== X-Received: by 2002:a17:907:1b12:b0:b76:7e0e:4246 with SMTP id a640c23a62f3a-b76c546da56mr1165976566b.12.1764249330169; Thu, 27 Nov 2025 05:15:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 07/28] include: move hw/fw-path-provider.h to hw/core/ Date: Thu, 27 Nov 2025 14:14:54 +0100 Message-ID: <20251127131516.80807-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764251391044019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- include/hw/{ =3D> core}/fw-path-provider.h | 0 include/hw/virtio/vhost-scsi-common.h | 2 +- hw/core/fw-path-provider.c | 2 +- hw/core/qdev-fw.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/pegasos.c | 2 +- hw/ppc/spapr.c | 2 +- hw/scsi/vhost-scsi-common.c | 2 +- hw/scsi/vhost-scsi.c | 2 +- hw/scsi/vhost-user-scsi.c | 2 +- hw/sparc64/sun4u.c | 2 +- 12 files changed, 11 insertions(+), 11 deletions(-) rename include/hw/{ =3D> core}/fw-path-provider.h (100%) diff --git a/include/hw/fw-path-provider.h b/include/hw/core/fw-path-provid= er.h similarity index 100% rename from include/hw/fw-path-provider.h rename to include/hw/core/fw-path-provider.h diff --git a/include/hw/virtio/vhost-scsi-common.h b/include/hw/virtio/vhos= t-scsi-common.h index d54d9c916f2..7f34c7cb4fe 100644 --- a/include/hw/virtio/vhost-scsi-common.h +++ b/include/hw/virtio/vhost-scsi-common.h @@ -16,7 +16,7 @@ =20 #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/vhost.h" -#include "hw/fw-path-provider.h" +#include "hw/core/fw-path-provider.h" #include "qom/object.h" =20 #define TYPE_VHOST_SCSI_COMMON "vhost-scsi-common" diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c index 4840faefd1a..2a9da1aa4a2 100644 --- a/hw/core/fw-path-provider.c +++ b/hw/core/fw-path-provider.c @@ -16,7 +16,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/fw-path-provider.h" +#include "hw/core/fw-path-provider.h" #include "qemu/module.h" =20 char *fw_path_provider_get_dev_path(FWPathProvider *p, BusState *bus, diff --git a/hw/core/qdev-fw.c b/hw/core/qdev-fw.c index a31958355ff..a587d2ddf90 100644 --- a/hw/core/qdev-fw.c +++ b/hw/core/qdev-fw.c @@ -16,7 +16,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/fw-path-provider.h" +#include "hw/core/fw-path-provider.h" #include "hw/qdev-core.h" =20 const char *qdev_fw_name(DeviceState *dev) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index bdc6c7ed7fe..3a6e47eb8b7 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -66,7 +66,7 @@ #include "hw/misc/macio/macio.h" #include "hw/ppc/openpic.h" #include "hw/loader.h" -#include "hw/fw-path-provider.h" +#include "hw/core/fw-path-provider.h" #include "elf.h" #include "qemu/error-report.h" #include "system/kvm.h" diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 8d35080b9d1..8f9ce68b8b0 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -43,7 +43,7 @@ #include "hw/char/escc.h" #include "hw/misc/macio/macio.h" #include "hw/loader.h" -#include "hw/fw-path-provider.h" +#include "hw/core/fw-path-provider.h" #include "elf.h" #include "qemu/error-report.h" #include "system/kvm.h" diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c index 3b48a54e7a0..e7396a729f3 100644 --- a/hw/ppc/pegasos.c +++ b/hw/ppc/pegasos.c @@ -26,7 +26,7 @@ #include "system/qtest.h" #include "hw/core/boards.h" #include "hw/loader.h" -#include "hw/fw-path-provider.h" +#include "hw/core/fw-path-provider.h" #include "elf.h" #include "qemu/log.h" #include "qemu/error-report.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6f2d10330d6..7c695ac4ecc 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -43,7 +43,7 @@ #include "system/reset.h" #include "system/runstate.h" #include "qemu/log.h" -#include "hw/fw-path-provider.h" +#include "hw/core/fw-path-provider.h" #include "elf.h" #include "net/net.h" #include "system/device_tree.h" diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c index 43525ba46d3..0bb4305de61 100644 --- a/hw/scsi/vhost-scsi-common.c +++ b/hw/scsi/vhost-scsi-common.c @@ -24,7 +24,7 @@ #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" -#include "hw/fw-path-provider.h" +#include "hw/core/fw-path-provider.h" =20 int vhost_scsi_common_start(VHostSCSICommon *vsc, Error **errp) { diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index cdf405b0f86..b356bd9762e 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -26,7 +26,7 @@ #include "hw/virtio/vhost.h" #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/virtio-bus.h" -#include "hw/fw-path-provider.h" +#include "hw/core/fw-path-provider.h" #include "hw/qdev-properties.h" #include "qemu/cutils.h" #include "system/system.h" diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 25f2d894e7c..0d7bbb52aba 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/fw-path-provider.h" +#include "hw/core/fw-path-provider.h" #include "hw/qdev-core.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 961d599f48d..62ceb7eef4d 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -54,7 +54,7 @@ #include "hw/sysbus.h" #include "hw/ide/pci.h" #include "hw/loader.h" -#include "hw/fw-path-provider.h" +#include "hw/core/fw-path-provider.h" #include "elf.h" #include "trace.h" #include "qom/object.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764251345; cv=none; d=zohomail.com; s=zohoarc; b=Cm6JQQnRLhk72ZwvNtwxvtz9bEuP0Y1MGHmX7VT/RzY4XTcTqXgxwnLurACvgQyyIhFHEzLxhBDWp5tgzuhhyNTcrpn9kJY7Tr689xNk8PZMUyk3ATi7s+co0LmA4ECJVjUyo1m1IDkz89yd7HHwyeELf2XRY3oRVcI5BWM2nXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764251345; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=Bw7Au92vBEE7EHdF1CnAMWxiCpqWaUehH7lggjaeklw=; b=dUymeLpQeupgxLwRB/wxaVD2xMIiL0c2ItOhFFzDYSki7mPbwTpwPoHndiillIUGpF+Er5BYR377xMi2MWV8okBB/Bkj0YyGMdHoxIkvOREj5omRe77ZNqP5AvHPgdtzVp0HkfYiqrEDxlaj+BrbCmZb+wyEY8zi71qhg6qLa9U= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764251345786278.64217313477457; Thu, 27 Nov 2025 05:49:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObqa-0002bd-CU; Thu, 27 Nov 2025 08:15:44 -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 1vObqU-0002Zf-Dt for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vObqS-0001DD-JF for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:38 -0500 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-509-IEBbESLJOGKnQEtV8zN7wg-1; Thu, 27 Nov 2025 08:15:34 -0500 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-b763bab126aso78741866b.3 for ; Thu, 27 Nov 2025 05:15:33 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f519e23esm165885666b.23.2025.11.27.05.15.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bw7Au92vBEE7EHdF1CnAMWxiCpqWaUehH7lggjaeklw=; b=buuEfT5a3X/XA2+hNBEqi2dKzDcqcR/Kt8envrd0OPpV4bEcLF5jdQbvCehpHYg6NX+BVL wAXh/zGkpMqiiAdFfr+DGdOn5mjf0Y+dZ41D1mYhU/DkZzmMRzf8hlaNGmkhb+IjfO2Fzu 2xapiLeT4ne+WW4gGcoyLwnVhB7yNTk= X-MC-Unique: IEBbESLJOGKnQEtV8zN7wg-1 X-Mimecast-MFC-AGG-ID: IEBbESLJOGKnQEtV8zN7wg_1764249333 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249332; x=1764854132; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Bw7Au92vBEE7EHdF1CnAMWxiCpqWaUehH7lggjaeklw=; b=L9UoAX1aPGzu+VZO7YeLEMvnhMU5CtSDubeP2dGfuKJlmocu/7cMEVA9V6nCMRcFDC Af+aMSUqYKXQNTmgb8k4KlKKRz4jVasOexBA/EISBnVlJ/o7uIUyU9EGpLEK05PpbJ9u YIDRX4/DZMwBIsBKtSD4Xz1Y7jcNH1+9fw6/zqFGnv0iSSzlcIClBGCJetaGDyyeL6CP vqgaFgJ/MXvCnk/vcyAWwUc3AfSgCoD74HzsFCdvBLbahdDzRfhTlAjx+WpZgmnPZsut l1jFq4rCdyrWFA+KrEmco8awUHkE1yHJagrI76nLZLZGYL9ETf2GIZord4iH8clHlUld I4cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249332; x=1764854132; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Bw7Au92vBEE7EHdF1CnAMWxiCpqWaUehH7lggjaeklw=; b=S3fUDuJHX4iPnogiNpDxUP9N/6nFsFlEH0T6BXsbPX6+We9ek/TnDMMg7OivVC9Gt6 fkFKhQ8ymiPueAdxaIagv8aMGO7oQprfxOKbEgmXcmypWtzowkYM0jIHfS46J9OdlZUS 3aG1vHsQmdysw/35iIzMkMhdnolPJJyKeojthhVy/Dt8vM23wyYEb5OHAx8sEa0FdDS9 7IkInnL9qpLXGVOiyee12eT7lGmfeObU8LL6Hw2z0/h1bkpnTlke6Z9KcZq4iUPva5kR ea6/T5mmwUtR6SAgBxXTdhRRSZZHDNd3TiZR7QEOe41966LtnISRckH589zPFTADLB6u 8zwg== X-Gm-Message-State: AOJu0YyvojPVYKDr0X1J7ylUIOiwkgJZZ9jBTp/lO0K4D6VGj0Jhvbgk BWA8K3GoPfMdDX8XisaO34tntq8SeN9LM3xzIgrGEOnn3BsqVWv2BxOGd/v8NBVhVUya96laG6c jdhsC9SlBm17MLLt8oSSYDXnaIjYrB7XCXN/w+t6U797JHA2L4TFJREAX104eZ/tasL3YZzlx6T tdSwJhhm5IUPoNWSsiqGXQnh6nhJ2S4LkT9RU+2Vbl X-Gm-Gg: ASbGncuFy+SUeT6eVTOvIG9hf1GRqclPWPwPnqCFLTOnsh9rMMfp0R2ycmVQiDeiH/3 EQfCobEjkA494pJ4C+oJiHkzSrJlFD7bk4Ai0hJFA6GVFJdW2bX7QgmYwY1qv6JqhBAiOC1uvb+ MWe2yttDRV5eIzawDVGyNfggINAD/5fXWfYdi/qpVZrBxco8ifRDioqtOZmrAg4v9zMYm1XD8EP 5LPd4NlmTtN6NYMb0vkt701xi+rDoa+pZ+25XHBmAcsgXIMF77XGQCA6OcvSeXVQ/vn+zlrRR6l I7fPXK4D0sHw/u1l9tkGC1yR3jne/Ew1/2Wv24GzdDH8LEreHRie4aipaKE96dnWGnpuki7gdy4 MFDQpkiQwMiJ+rDLq1ihWQmDhkpl1qSPSNAHd1zUDuZTF8j7rVlzSgeeSAzyppN04K4ImzAgO2F vWYDse2KqgX2Jhb9U= X-Received: by 2002:a17:907:1c28:b0:b73:3ced:2f59 with SMTP id a640c23a62f3a-b76715dcc1bmr2659629366b.27.1764249331999; Thu, 27 Nov 2025 05:15:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IHv5zx2oOuKZheCWtSTZ/9HMEYYJjUqgEyqdX8ovI/9vLVYQxRQzFHfn4cbBM5U04UT3GYe6w== X-Received: by 2002:a17:907:1c28:b0:b73:3ced:2f59 with SMTP id a640c23a62f3a-b76715dcc1bmr2659623966b.27.1764249331464; Thu, 27 Nov 2025 05:15:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 08/28] include: move hw/hotplug.h to hw/core/ Date: Thu, 27 Nov 2025 14:14:55 +0100 Message-ID: <20251127131516.80807-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764251346793019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- include/hw/acpi/cpu.h | 2 +- include/hw/acpi/cpu_hotplug.h | 2 +- include/hw/acpi/pcihp.h | 2 +- include/hw/{ =3D> core}/hotplug.h | 0 include/hw/i386/pc.h | 2 +- include/hw/pci/pcie.h | 2 +- include/hw/pci/shpc.h | 2 +- include/hw/qdev-core.h | 2 +- hw/acpi/acpi-nvdimm-stub.c | 2 +- hw/acpi/piix4.c | 2 +- hw/core/hotplug.c | 2 +- hw/pci-bridge/pci_bridge_dev.c | 2 +- hw/pci/pci.c | 2 +- hw/pci/pcie_port.c | 2 +- hw/s390x/css-bridge.c | 2 +- 15 files changed, 14 insertions(+), 14 deletions(-) rename include/hw/{ =3D> core}/hotplug.h (100%) diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h index 95dc58b5adb..a64d19445cc 100644 --- a/include/hw/acpi/cpu.h +++ b/include/hw/acpi/cpu.h @@ -17,7 +17,7 @@ #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" #include "hw/core/boards.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" =20 #define ACPI_CPU_HOTPLUG_REG_LEN 12 =20 diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h index 3b932abbbbe..5b670b04eb6 100644 --- a/include/hw/acpi/cpu_hotplug.h +++ b/include/hw/acpi/cpu_hotplug.h @@ -16,7 +16,7 @@ #include "hw/acpi/acpi.h" #include "hw/acpi/pc-hotplug.h" #include "hw/acpi/aml-build.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" #include "hw/acpi/cpu.h" =20 typedef struct AcpiCpuHotplug { diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h index ca6a2588258..efce5fd2e10 100644 --- a/include/hw/acpi/pcihp.h +++ b/include/hw/acpi/pcihp.h @@ -29,7 +29,7 @@ =20 #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" =20 #define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base" #define ACPI_PCIHP_IO_LEN_PROP "acpi-pcihp-io-len" diff --git a/include/hw/hotplug.h b/include/hw/core/hotplug.h similarity index 100% rename from include/hw/hotplug.h rename to include/hw/core/hotplug.h diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index ade2da92bad..b3a45ab71a8 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -9,7 +9,7 @@ #include "hw/block/flash.h" #include "hw/i386/x86.h" =20 -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" #include "qom/object.h" #include "hw/i386/sgx-epc.h" #include "hw/cxl/cxl.h" diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h index 42cebcd0338..c880ae1e04b 100644 --- a/include/hw/pci/pcie.h +++ b/include/hw/pci/pcie.h @@ -25,7 +25,7 @@ #include "hw/pci/pcie_regs.h" #include "hw/pci/pcie_aer.h" #include "hw/pci/pcie_sriov.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" =20 typedef struct PCIEPort PCIEPort; typedef struct PCIESlot PCIESlot; diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h index ad1089567a0..fce5bdd3bc7 100644 --- a/include/hw/pci/shpc.h +++ b/include/hw/pci/shpc.h @@ -2,7 +2,7 @@ #define SHPC_H =20 #include "system/memory.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" #include "hw/pci/pci_device.h" #include "migration/vmstate.h" =20 diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 018c134011e..8170836d432 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -7,7 +7,7 @@ #include "qemu/rcu.h" #include "qemu/rcu_queue.h" #include "qom/object.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" #include "hw/irq.h" #include "hw/resettable.h" =20 diff --git a/hw/acpi/acpi-nvdimm-stub.c b/hw/acpi/acpi-nvdimm-stub.c index 65f491d6535..22ba17f5118 100644 --- a/hw/acpi/acpi-nvdimm-stub.c +++ b/hw/acpi/acpi-nvdimm-stub.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" #include "hw/mem/nvdimm.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" =20 void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev) { diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 7a18f18dda2..9e0892a51f8 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -35,7 +35,7 @@ #include "qemu/range.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h" #include "hw/acpi/memory_hotplug.h" diff --git a/hw/core/hotplug.c b/hw/core/hotplug.c index 17ac9866859..68aabad8ae0 100644 --- a/hw/core/hotplug.c +++ b/hw/core/hotplug.c @@ -10,7 +10,7 @@ * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" #include "qemu/module.h" =20 void hotplug_handler_pre_plug(HotplugHandler *plug_handler, diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c index b328e50ab31..cb4809f38b1 100644 --- a/hw/pci-bridge/pci_bridge_dev.c +++ b/hw/pci-bridge/pci_bridge_dev.c @@ -30,7 +30,7 @@ #include "hw/qdev-properties.h" #include "system/memory.h" #include "hw/pci/pci_bus.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" #include "qom/object.h" =20 #define TYPE_PCI_BRIDGE_DEV "pci-bridge" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index e03953813c2..02a59f355b6 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -45,7 +45,7 @@ #include "trace.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" #include "hw/core/boards.h" #include "hw/nvram/fw_cfg.h" #include "qapi/error.h" diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c index f3841a26568..20b5e4cfb51 100644 --- a/hw/pci/pcie_port.c +++ b/hw/pci/pcie_port.c @@ -22,7 +22,7 @@ #include "hw/pci/pcie_port.h" #include "hw/qdev-properties.h" #include "qemu/module.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" =20 void pcie_port_init_reg(PCIDevice *d) { diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c index 0f87b8c5c44..f3b6ef56300 100644 --- a/hw/s390x/css-bridge.c +++ b/hw/s390x/css-bridge.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hotplug.h" +#include "hw/core/hotplug.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/bitops.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764251189; cv=none; d=zohomail.com; s=zohoarc; b=lellyH2OT3F5caMZmohO1WSoJa3XDU3Q4KW93AXfoGrzsXnQV/wO46Oyb/WUOPU3f4c9rS0TUp0NwvRVfBCCi15LLBVKy0P0U2cUUoZV6tFmk0CuZk0xTDS3wCydoGgN4FJrtgUGzljsvLb36eR57y1l2DrYfGXRLpf9XldfXjg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764251189; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=xi2qp9A3OlPda+UIHyZfNuA0l3dvijpMohD+GlNPRrc=; b=cUypYLU0jQOyMX65iz3+c+nvdirLIbBWVNjto5nfq2Lj8u0oNiTAbsJCZTiUWMlz6nmFGrrZR7BkCFBes8fQ9p8ZozD52ojW15gWkhNOEgPXtbRPS4jZDm1IexmQOwSnr7ghesnHdn5fvW8lCe9Ey2//ZIdDxu9Xe2AY9FZuQJw= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176425118969425.73765629234765; Thu, 27 Nov 2025 05:46:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObso-0004z8-DZ; Thu, 27 Nov 2025 08:18:02 -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 1vObqe-0002dg-W3 for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:49 -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 1vObqa-0001FN-54 for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:48 -0500 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-636-BbpvHOxzOWqMQej-M1LNPA-1; Thu, 27 Nov 2025 08:15:40 -0500 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-b71043a0e4fso81259666b.2 for ; Thu, 27 Nov 2025 05:15:40 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f51c55e9sm158136166b.26.2025.11.27.05.15.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xi2qp9A3OlPda+UIHyZfNuA0l3dvijpMohD+GlNPRrc=; b=LdQGuDaUvQgBhx4sHE0JlAdBMurR8sfjpalP3VITlRW+fUg7ckgDLgCs1mADRsrQfY7ccX gAj08v2KPxPmWbiSb4Z3Py7wmXXbiQ+cYrvC0AGT1xnFXUxoWaJSnU3tRF8nZFrr7kX+q6 tAxkOnqjxCDGklE35oNOGNuUlr5Ky1Y= X-MC-Unique: BbpvHOxzOWqMQej-M1LNPA-1 X-Mimecast-MFC-AGG-ID: BbpvHOxzOWqMQej-M1LNPA_1764249339 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249339; x=1764854139; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xi2qp9A3OlPda+UIHyZfNuA0l3dvijpMohD+GlNPRrc=; b=Mx0l5n5WIa2LaNCHivRMzly2yPjLRx/5Nhgi19uvWxDNj4JGIlud772XdKiS1WmNLe bXdAX7rIcaNcDt0h2Wv2dcmateAM9U16QSgtY3zw+cUJbUHqSyTZBbViIahvzC+spDH/ WZhPtqoBMMuqKJ/5GHLG0ybHbAY5U6Nxp7au9bmd3ioSWpUgFVOv0U2uGR8pWJcGktHm rfMMhIWCAepUiiKtNCokTPNWM8irSM3mQmz1aGV1GEr8UoSbXEyvOVqqQ7Ns8s4rG+VA pLW23M7ifFsO8wZJwebWnxIUroAmR3CfFnVGp12KVp8A3uV2ExDos8atyNl5b9pHy5J5 euxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249339; x=1764854139; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=xi2qp9A3OlPda+UIHyZfNuA0l3dvijpMohD+GlNPRrc=; b=vGxF8sH3OozCVNcN9s7wf+7EpKBarXMbe5sL6WGza/T4g8yzEz+dxdSZG61kXajFB0 +SMr6RoReWtRnZvO0RBOJIaDv/cC4NjdBjGJRlwQ3+XXc4wRPH7Rd2mD/Yoay4J/TzDn 5Pm9o/oIBTHtO3OVhBWwpAyfHYylNm3tk2qd6JJ40cVw77T5P/ywY1/mptfJGoMM8WUp olrpEdhA/IXFYVGuFNatU/Vl2pmI86mc8jDfjuvwXXwcqkVK4OEGDUsa1aHnIXoEshFW 5dHhAyEEC5hij9GPGyf+xrrit93WARBnHrz5En+u8kKnn5Yf4Ej0oW0r61iQjesvyX7Y bviQ== X-Gm-Message-State: AOJu0YxTgICYT86TZNwHuDeR56ns3GUFmhTAwr1cA71PbqZwNvkNL8WM HCyjvGy8Qs0c0NajLfIYSV3DMEKaTEXTY5vjL7+2Q6XPVUt7YGIFy50X2Qvx5tp0i3pZ4m6gWth 4cY17NwWifQdg31oK6ZcvEm8vME3u/M94CEHwiO5NEtIpKXnCGLvmC/7zHl3/hptlv0nmTonya9 j+lYW7+4SfNBuHECyM2GCdUD4B8S3BlympkIGrwzKF X-Gm-Gg: ASbGnctqVg7kiYT/e9cpDeU1zSTmZdM0Qb4F2Is972zMAA6NPwW80hoyYQoKp356u7o Kgrx8ZeJT6FgZou+r8LrWKAQmjozZc8tANoBCfmj/UaI2sDNtP9CdGt1lj9+NJZtfB1954nWXXn xNXYcW+nhqsTwr2E2avuBVG/bwhp+DRREspDZq+HPOue4rlp1mEJIw+S+6MaGcEaNrHCGZkvsO5 qpNS1qkFvvKELoWoUY1/x4xnbfNLWhi/zMZKpQReadQOt/XesEN0skoabjg19ADjoEeI++erEkC Mi3MnWsw2NbfKuLbS7FClTyu/ri47MqNriSoeOv+SCpQKpvwRYnbezoKPV1C3LnPV/n1KMYMmhN m2WgYFvvFIn8F4Khpkvg8nv46yrJHr8g8O7nV3PJ6EYsCE3Pzqk65Jdpnp4TQXOuUC3F6j4wvNr B73TBKXb8xsnAHjkw= X-Received: by 2002:a17:907:7245:b0:b76:339d:63ed with SMTP id a640c23a62f3a-b767183c00emr2385582866b.52.1764249336744; Thu, 27 Nov 2025 05:15:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IHimDJXLbA1yyJ4NevnRnqnBVnfNLdVEgWKhc1t8HlpFQ6pXyb5R229VfwN7pXU5B9t7Dyplg== X-Received: by 2002:a17:907:7245:b0:b76:339d:63ed with SMTP id a640c23a62f3a-b767183c00emr2385563066b.52.1764249334497; Thu, 27 Nov 2025 05:15:34 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 09/28] include: move hw/irq.h to hw/core/ Date: Thu, 27 Nov 2025 14:14:56 +0100 Message-ID: <20251127131516.80807-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764251192083019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- hw/net/pcnet.h | 2 +- hw/scsi/ncr53c710.h | 2 +- hw/usb/hcd-dwc2.h | 2 +- include/hw/adc/npcm7xx_adc.h | 2 +- include/hw/char/parallel.h | 2 +- include/hw/{ =3D> core}/irq.h | 0 include/hw/display/macfb.h | 2 +- include/hw/i2c/npcm7xx_smbus.h | 2 +- include/hw/ide/ahci-pci.h | 2 +- include/hw/input/pl050.h | 2 +- include/hw/ipack/ipack.h | 2 +- include/hw/misc/bcm2835_mphi.h | 2 +- include/hw/misc/npcm7xx_mft.h | 2 +- include/hw/misc/npcm7xx_pwm.h | 2 +- include/hw/misc/xlnx-versal-trng.h | 2 +- include/hw/net/imx_fec.h | 2 +- include/hw/net/npcm7xx_emc.h | 2 +- include/hw/net/npcm_gmac.h | 2 +- include/hw/nvram/xlnx-bbram.h | 2 +- include/hw/nvram/xlnx-versal-efuse.h | 2 +- include/hw/nvram/xlnx-zynqmp-efuse.h | 2 +- include/hw/ppc/spapr_vio.h | 2 +- include/hw/qdev-core.h | 2 +- include/hw/timer/bcm2835_systmr.h | 2 +- include/hw/timer/stellaris-gptm.h | 2 +- include/hw/watchdog/sbsa_gwdt.h | 2 +- include/hw/watchdog/wdt_imx2.h | 2 +- rust/hw/core/wrapper.h | 2 +- accel/kvm/kvm-all.c | 2 +- hw/acpi/core.c | 2 +- hw/acpi/generic_event_device.c | 2 +- hw/acpi/piix4.c | 2 +- hw/adc/aspeed_adc.c | 2 +- hw/adc/zynq-xadc.c | 2 +- hw/alpha/typhoon.c | 2 +- hw/arm/armsse.c | 2 +- hw/arm/exynos4210.c | 2 +- hw/arm/exynos4_boards.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/mps2-tz.c | 2 +- hw/arm/musicpal.c | 2 +- hw/arm/omap1.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/smmuv3.c | 2 +- hw/arm/stellaris.c | 2 +- hw/arm/strongarm.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/virt.c | 2 +- hw/audio/asc.c | 2 +- hw/audio/cs4231a.c | 2 +- hw/audio/gus.c | 2 +- hw/audio/marvell_88w8618.c | 2 +- hw/audio/pl041.c | 2 +- hw/audio/sb16.c | 2 +- hw/block/fdc-isa.c | 2 +- hw/block/fdc.c | 2 +- hw/char/avr_usart.c | 2 +- hw/char/bcm2835_aux.c | 2 +- hw/char/cadence_uart.c | 2 +- hw/char/cmsdk-apb-uart.c | 2 +- hw/char/diva-gsp.c | 2 +- hw/char/escc.c | 2 +- hw/char/exynos4210_uart.c | 2 +- hw/char/goldfish_tty.c | 2 +- hw/char/grlib_apbuart.c | 2 +- hw/char/ibex_uart.c | 2 +- hw/char/imx_serial.c | 2 +- hw/char/ipoctal232.c | 2 +- hw/char/max78000_uart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/nrf51_uart.c | 2 +- hw/char/pl011.c | 2 +- hw/char/renesas_sci.c | 2 +- hw/char/serial-pci-multi.c | 2 +- hw/char/serial-pci.c | 2 +- hw/char/serial.c | 2 +- hw/char/sh_serial.c | 2 +- hw/char/sifive_uart.c | 2 +- hw/char/stm32f2xx_usart.c | 2 +- hw/char/stm32l4x5_usart.c | 2 +- hw/char/xilinx_uartlite.c | 2 +- hw/core/gpio.c | 2 +- hw/core/irq.c | 2 +- hw/core/or-irq.c | 2 +- hw/core/qdev.c | 2 +- hw/core/split-irq.c | 2 +- hw/cpu/a15mpcore.c | 2 +- hw/cpu/a9mpcore.c | 2 +- hw/cpu/arm11mpcore.c | 2 +- hw/cpu/realview_mpcore.c | 2 +- hw/display/bcm2835_fb.c | 2 +- hw/display/cg3.c | 2 +- hw/display/dm163.c | 2 +- hw/display/exynos4210_fimd.c | 2 +- hw/display/g364fb.c | 2 +- hw/display/omap_lcdc.c | 2 +- hw/display/pl110.c | 2 +- hw/display/xlnx_dp.c | 2 +- hw/dma/bcm2835_dma.c | 2 +- hw/dma/omap_dma.c | 2 +- hw/dma/pl080.c | 2 +- hw/dma/pl330.c | 2 +- hw/dma/rc4030.c | 2 +- hw/dma/sifive_pdma.c | 2 +- hw/dma/sparc32_dma.c | 2 +- hw/dma/xilinx_axidma.c | 2 +- hw/dma/xlnx-zdma.c | 2 +- hw/dma/xlnx-zynq-devcfg.c | 2 +- hw/dma/xlnx_csu_dma.c | 2 +- hw/dma/xlnx_dpdma.c | 2 +- hw/gpio/aspeed_gpio.c | 2 +- hw/gpio/bcm2835_gpio.c | 2 +- hw/gpio/bcm2838_gpio.c | 2 +- hw/gpio/gpio_key.c | 2 +- hw/gpio/imx_gpio.c | 2 +- hw/gpio/mpc8xxx.c | 2 +- hw/gpio/npcm7xx_gpio.c | 2 +- hw/gpio/nrf51_gpio.c | 2 +- hw/gpio/omap_gpio.c | 2 +- hw/gpio/pca9552.c | 2 +- hw/gpio/pca9554.c | 2 +- hw/gpio/pcf8574.c | 2 +- hw/gpio/pl061.c | 2 +- hw/gpio/sifive_gpio.c | 2 +- hw/gpio/stm32l4x5_gpio.c | 2 +- hw/gpio/zaurus.c | 2 +- hw/i2c/allwinner-i2c.c | 2 +- hw/i2c/aspeed_i2c.c | 2 +- hw/i2c/bcm2835_i2c.c | 2 +- hw/i2c/bitbang_i2c.c | 2 +- hw/i2c/exynos4210_i2c.c | 2 +- hw/i2c/imx_i2c.c | 2 +- hw/i2c/mpc_i2c.c | 2 +- hw/i2c/omap_i2c.c | 2 +- hw/i2c/ppc4xx_i2c.c | 2 +- hw/i386/kvm/i8259.c | 2 +- hw/i386/kvm/xen_evtchn.c | 2 +- hw/i386/microvm.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/port92.c | 2 +- hw/i386/x86-common.c | 2 +- hw/i386/x86-cpu.c | 2 +- hw/i386/xen/xen-hvm.c | 2 +- hw/ide/ahci.c | 2 +- hw/ide/core.c | 2 +- hw/ide/macio.c | 2 +- hw/ide/pci.c | 2 +- hw/ide/via.c | 2 +- hw/input/lasips2.c | 2 +- hw/input/pckbd.c | 2 +- hw/input/pl050.c | 2 +- hw/input/ps2.c | 2 +- hw/input/stellaris_gamepad.c | 2 +- hw/intc/allwinner-a10-pic.c | 2 +- hw/intc/arm_gic.c | 2 +- hw/intc/arm_gicv2m.c | 2 +- hw/intc/arm_gicv3_cpuif.c | 2 +- hw/intc/armv7m_nvic.c | 2 +- hw/intc/aspeed_intc.c | 2 +- hw/intc/aspeed_vic.c | 2 +- hw/intc/bcm2835_ic.c | 2 +- hw/intc/bcm2836_control.c | 2 +- hw/intc/exynos4210_combiner.c | 2 +- hw/intc/exynos4210_gic.c | 2 +- hw/intc/goldfish_pic.c | 2 +- hw/intc/grlib_irqmp.c | 2 +- hw/intc/heathrow_pic.c | 2 +- hw/intc/i8259.c | 2 +- hw/intc/imx_avic.c | 2 +- hw/intc/loongarch_dintc.c | 2 +- hw/intc/loongarch_extioi.c | 2 +- hw/intc/loongarch_pch_msi.c | 2 +- hw/intc/loongarch_pch_pic.c | 2 +- hw/intc/loongson_ipi_common.c | 2 +- hw/intc/loongson_liointc.c | 2 +- hw/intc/mips_gic.c | 2 +- hw/intc/omap_intc.c | 2 +- hw/intc/ompic.c | 2 +- hw/intc/openpic.c | 2 +- hw/intc/pl190.c | 2 +- hw/intc/ppc-uic.c | 2 +- hw/intc/realview_gic.c | 2 +- hw/intc/riscv_aclint.c | 2 +- hw/intc/riscv_aplic.c | 2 +- hw/intc/riscv_imsic.c | 2 +- hw/intc/rx_icu.c | 2 +- hw/intc/sh_intc.c | 2 +- hw/intc/sifive_plic.c | 2 +- hw/intc/slavio_intctl.c | 2 +- hw/intc/xics.c | 2 +- hw/intc/xilinx_intc.c | 2 +- hw/intc/xive.c | 2 +- hw/intc/xlnx-pmu-iomod-intc.c | 2 +- hw/intc/xlnx-zynqmp-ipi.c | 2 +- hw/ipack/ipack.c | 2 +- hw/ipack/tpci200.c | 2 +- hw/ipmi/isa_ipmi_bt.c | 2 +- hw/ipmi/isa_ipmi_kcs.c | 2 +- hw/isa/i82378.c | 2 +- hw/isa/lpc_ich9.c | 2 +- hw/isa/piix.c | 2 +- hw/isa/vt82c686.c | 2 +- hw/loongarch/virt.c | 2 +- hw/m68k/mcf5206.c | 2 +- hw/m68k/mcf5208.c | 2 +- hw/m68k/mcf_intc.c | 2 +- hw/m68k/next-cube.c | 2 +- hw/m68k/q800-glue.c | 2 +- hw/mips/malta.c | 2 +- hw/mips/mips_int.c | 2 +- hw/misc/arm_sysctl.c | 2 +- hw/misc/armsse-mhu.c | 2 +- hw/misc/aspeed_hace.c | 2 +- hw/misc/aspeed_lpc.c | 2 +- hw/misc/aspeed_peci.c | 2 +- hw/misc/aspeed_xdma.c | 2 +- hw/misc/avr_power.c | 2 +- hw/misc/bcm2835_mbox.c | 2 +- hw/misc/bcm2835_property.c | 2 +- hw/misc/eccmemctl.c | 2 +- hw/misc/imx_rngc.c | 2 +- hw/misc/iotkit-secctl.c | 2 +- hw/misc/ivshmem-flat.c | 2 +- hw/misc/lasi.c | 2 +- hw/misc/mac_via.c | 2 +- hw/misc/macio/cuda.c | 2 +- hw/misc/macio/gpio.c | 2 +- hw/misc/macio/mac_dbdma.c | 2 +- hw/misc/macio/pmu.c | 2 +- hw/misc/max78000_aes.c | 2 +- hw/misc/max78000_gcr.c | 2 +- hw/misc/max78000_icc.c | 2 +- hw/misc/max78000_trng.c | 2 +- hw/misc/mchp_pfsoc_ioscb.c | 2 +- hw/misc/mchp_pfsoc_sysreg.c | 2 +- hw/misc/mos6522.c | 2 +- hw/misc/mps2-scc.c | 2 +- hw/misc/npcm7xx_mft.c | 2 +- hw/misc/npcm7xx_pwm.c | 2 +- hw/misc/nrf51_rng.c | 2 +- hw/misc/omap_clk.c | 2 +- hw/misc/pc-testdev.c | 2 +- hw/misc/sifive_e_aon.c | 2 +- hw/misc/slavio_misc.c | 2 +- hw/misc/stm32_rcc.c | 2 +- hw/misc/stm32f4xx_exti.c | 2 +- hw/misc/stm32f4xx_syscfg.c | 2 +- hw/misc/stm32l4x5_exti.c | 2 +- hw/misc/stm32l4x5_rcc.c | 2 +- hw/misc/stm32l4x5_syscfg.c | 2 +- hw/misc/tz-mpc.c | 2 +- hw/misc/tz-msc.c | 2 +- hw/misc/tz-ppc.c | 2 +- hw/misc/xlnx-versal-cframe-reg.c | 2 +- hw/misc/xlnx-versal-cfu.c | 2 +- hw/misc/xlnx-versal-crl.c | 2 +- hw/misc/xlnx-versal-pmc-iou-slcr.c | 2 +- hw/misc/xlnx-versal-xramc.c | 2 +- hw/misc/xlnx-zynqmp-apu-ctrl.c | 2 +- hw/misc/xlnx-zynqmp-crf.c | 2 +- hw/net/allwinner-sun8i-emac.c | 2 +- hw/net/allwinner_emac.c | 2 +- hw/net/cadence_gem.c | 2 +- hw/net/can/can_kvaser_pci.c | 2 +- hw/net/can/can_mioe3680_pci.c | 2 +- hw/net/can/can_pcm3680_pci.c | 2 +- hw/net/can/can_sja1000.c | 2 +- hw/net/can/ctucan_core.c | 2 +- hw/net/can/ctucan_pci.c | 2 +- hw/net/can/xlnx-versal-canfd.c | 2 +- hw/net/can/xlnx-zynqmp-can.c | 2 +- hw/net/dp8393x.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/net/ftgmac100.c | 2 +- hw/net/i82596.c | 2 +- hw/net/imx_fec.c | 2 +- hw/net/lan9118.c | 2 +- hw/net/lan9118_phy.c | 2 +- hw/net/mcf_fec.c | 2 +- hw/net/msf2-emac.c | 2 +- hw/net/mv88w8618_eth.c | 2 +- hw/net/ne2000-pci.c | 2 +- hw/net/ne2000.c | 2 +- hw/net/npcm7xx_emc.c | 2 +- hw/net/opencores_eth.c | 2 +- hw/net/pcnet-pci.c | 2 +- hw/net/pcnet.c | 2 +- hw/net/smc91c111.c | 2 +- hw/net/stellaris_enet.c | 2 +- hw/net/tulip.c | 2 +- hw/net/xgmac.c | 2 +- hw/net/xilinx_axienet.c | 2 +- hw/net/xilinx_ethlite.c | 2 +- hw/nubus/nubus-device.c | 2 +- hw/openrisc/openrisc_sim.c | 2 +- hw/openrisc/virt.c | 2 +- hw/pci-host/articia.c | 2 +- hw/pci-host/aspeed_pcie.c | 2 +- hw/pci-host/astro.c | 2 +- hw/pci-host/bonito.c | 2 +- hw/pci-host/designware.c | 2 +- hw/pci-host/dino.c | 2 +- hw/pci-host/gpex.c | 2 +- hw/pci-host/grackle.c | 2 +- hw/pci-host/gt64120.c | 2 +- hw/pci-host/mv64361.c | 2 +- hw/pci-host/pnv_phb3.c | 2 +- hw/pci-host/pnv_phb3_msi.c | 2 +- hw/pci-host/pnv_phb4.c | 2 +- hw/pci-host/ppc440_pcix.c | 2 +- hw/pci-host/ppc4xx_pci.c | 2 +- hw/pci-host/ppce500.c | 2 +- hw/pci-host/raven.c | 2 +- hw/pci-host/sabre.c | 2 +- hw/pci-host/sh_pci.c | 2 +- hw/pci-host/uninorth.c | 2 +- hw/pci-host/versatile.c | 2 +- hw/pci-host/xilinx-pcie.c | 2 +- hw/pci/pci.c | 2 +- hw/ppc/e500.c | 2 +- hw/ppc/pegasos.c | 2 +- hw/ppc/pnv_chiptod.c | 2 +- hw/ppc/pnv_i2c.c | 2 +- hw/ppc/pnv_lpc.c | 2 +- hw/ppc/pnv_occ.c | 2 +- hw/ppc/pnv_psi.c | 2 +- hw/ppc/pnv_sbe.c | 2 +- hw/ppc/ppc.c | 2 +- hw/ppc/ppc440_uc.c | 2 +- hw/ppc/ppc4xx_sdram.c | 2 +- hw/ppc/prep_systemio.c | 2 +- hw/ppc/spapr_events.c | 2 +- hw/ppc/spapr_irq.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/riscv/riscv-iommu-sys.c | 2 +- hw/riscv/sifive_u.c | 2 +- hw/rtc/exynos4210_rtc.c | 2 +- hw/rtc/goldfish_rtc.c | 2 +- hw/rtc/ls7a_rtc.c | 2 +- hw/rtc/m48t59.c | 2 +- hw/rtc/mc146818rtc.c | 2 +- hw/rtc/pl031.c | 2 +- hw/rtc/xlnx-zynqmp-rtc.c | 2 +- hw/scsi/esp-pci.c | 2 +- hw/scsi/esp.c | 2 +- hw/scsi/lsi53c895a.c | 2 +- hw/scsi/ncr53c710.c | 2 +- hw/sd/allwinner-sdhost.c | 2 +- hw/sd/aspeed_sdhci.c | 2 +- hw/sd/bcm2835_sdhost.c | 2 +- hw/sd/omap_mmc.c | 2 +- hw/sd/pl181.c | 2 +- hw/sd/sd.c | 2 +- hw/sd/sdhci-pci.c | 2 +- hw/sd/sdhci.c | 2 +- hw/sensor/adm1266.c | 2 +- hw/sensor/adm1272.c | 2 +- hw/sensor/max31785.c | 2 +- hw/sensor/max34451.c | 2 +- hw/sensor/tmp105.c | 2 +- hw/sh4/r2d.c | 2 +- hw/sh4/sh7750.c | 2 +- hw/sparc/leon3.c | 2 +- hw/sparc/sun4m.c | 2 +- hw/sparc/sun4m_iommu.c | 2 +- hw/sparc64/sun4u.c | 2 +- hw/ssi/allwinner-a10-spi.c | 2 +- hw/ssi/aspeed_smc.c | 2 +- hw/ssi/bcm2835_spi.c | 2 +- hw/ssi/ibex_spi_host.c | 2 +- hw/ssi/imx_spi.c | 2 +- hw/ssi/mss-spi.c | 2 +- hw/ssi/npcm7xx_fiu.c | 2 +- hw/ssi/npcm_pspi.c | 2 +- hw/ssi/pl022.c | 2 +- hw/ssi/pnv_spi.c | 2 +- hw/ssi/sifive_spi.c | 2 +- hw/ssi/xilinx_spi.c | 2 +- hw/ssi/xilinx_spips.c | 2 +- hw/ssi/xlnx-versal-ospi.c | 2 +- hw/timer/a9gtimer.c | 2 +- hw/timer/allwinner-a10-pit.c | 2 +- hw/timer/arm_mptimer.c | 2 +- hw/timer/arm_timer.c | 2 +- hw/timer/armv7m_systick.c | 2 +- hw/timer/aspeed_timer.c | 2 +- hw/timer/avr_timer16.c | 2 +- hw/timer/cadence_ttc.c | 2 +- hw/timer/cmsdk-apb-dualtimer.c | 2 +- hw/timer/cmsdk-apb-timer.c | 2 +- hw/timer/exynos4210_mct.c | 2 +- hw/timer/exynos4210_pwm.c | 2 +- hw/timer/grlib_gptimer.c | 2 +- hw/timer/hpet.c | 2 +- hw/timer/i8254.c | 2 +- hw/timer/ibex_timer.c | 2 +- hw/timer/imx_epit.c | 2 +- hw/timer/imx_gpt.c | 2 +- hw/timer/mss-timer.c | 2 +- hw/timer/npcm7xx_timer.c | 2 +- hw/timer/nrf51_timer.c | 2 +- hw/timer/pxa2xx_timer.c | 2 +- hw/timer/renesas_cmt.c | 2 +- hw/timer/renesas_tmr.c | 2 +- hw/timer/sh_timer.c | 2 +- hw/timer/sifive_pwm.c | 2 +- hw/timer/slavio_timer.c | 2 +- hw/timer/sse-timer.c | 2 +- hw/timer/stm32f2xx_timer.c | 2 +- hw/timer/xilinx_timer.c | 2 +- hw/tpm/tpm_tis_common.c | 2 +- hw/ufs/ufs.c | 2 +- hw/usb/hcd-ehci.c | 2 +- hw/usb/hcd-ohci-sysbus.c | 2 +- hw/usb/hcd-ohci.c | 2 +- hw/usb/hcd-uhci.c | 2 +- hw/usb/hcd-xhci-sysbus.c | 2 +- hw/usb/vt82c686-uhci-pci.c | 2 +- hw/usb/xlnx-versal-usb2-ctrl-regs.c | 2 +- hw/virtio/virtio-mmio.c | 2 +- hw/vmapple/aes.c | 2 +- hw/vmapple/vmapple.c | 2 +- hw/watchdog/cmsdk-apb-watchdog.c | 2 +- hw/xen/xen-pvh-common.c | 2 +- hw/xtensa/mx_pic.c | 2 +- hw/xtensa/pic_cpu.c | 2 +- system/qtest.c | 2 +- target/arm/cpregs-gcs.c | 2 +- target/arm/cpregs-pmu.c | 2 +- target/arm/helper.c | 2 +- target/arm/hvf/hvf.c | 2 +- target/arm/kvm.c | 2 +- target/i386/tcg/system/fpu_helper.c | 2 +- target/loongarch/kvm/kvm.c | 2 +- target/loongarch/tcg/csr_helper.c | 2 +- target/mips/system/cp0_timer.c | 2 +- target/riscv/kvm/kvm-cpu.c | 2 +- target/rx/helper.c | 2 +- hw/display/apple-gfx-mmio.m | 2 +- 439 files changed, 438 insertions(+), 438 deletions(-) rename include/hw/{ =3D> core}/irq.h (100%) diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h index a94356ec30b..d12e7cbf9e2 100644 --- a/hw/net/pcnet.h +++ b/hw/net/pcnet.h @@ -8,7 +8,7 @@ #define PCNET_LOOPTEST_NOCRC 2 =20 #include "system/memory.h" -#include "hw/irq.h" +#include "hw/core/irq.h" =20 /* BUS CONFIGURATION REGISTERS */ #define BCR_MSRDA 0 diff --git a/hw/scsi/ncr53c710.h b/hw/scsi/ncr53c710.h index 6d30f9b6632..9ae64a182d5 100644 --- a/hw/scsi/ncr53c710.h +++ b/hw/scsi/ncr53c710.h @@ -21,7 +21,7 @@ #include "qemu/fifo8.h" #include "qom/object.h" #include "system/memory.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/timer.h" =20 #define TYPE_NCR710_SCSI "ncr710-scsi" diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h index 0c02392ade0..a99409a654b 100644 --- a/hw/usb/hcd-dwc2.h +++ b/hw/usb/hcd-dwc2.h @@ -20,7 +20,7 @@ #define HW_USB_HCD_DWC2_H =20 #include "qemu/timer.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/usb/usb.h" #include "system/dma.h" diff --git a/include/hw/adc/npcm7xx_adc.h b/include/hw/adc/npcm7xx_adc.h index a0c56d42365..02dc1902fce 100644 --- a/include/hw/adc/npcm7xx_adc.h +++ b/include/hw/adc/npcm7xx_adc.h @@ -17,7 +17,7 @@ #define NPCM7XX_ADC_H =20 #include "hw/core/clock.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "qemu/timer.h" =20 diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h index 3f8d9b59a76..f2c92eb5bc0 100644 --- a/include/hw/char/parallel.h +++ b/include/hw/char/parallel.h @@ -3,7 +3,7 @@ =20 #include "system/memory.h" #include "hw/isa/isa.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "chardev/char-fe.h" #include "chardev/char.h" =20 diff --git a/include/hw/irq.h b/include/hw/core/irq.h similarity index 100% rename from include/hw/irq.h rename to include/hw/core/irq.h diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h index 0fae1f33a65..356a03ce31a 100644 --- a/include/hw/display/macfb.h +++ b/include/hw/display/macfb.h @@ -14,7 +14,7 @@ #define MACFB_H =20 #include "system/memory.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/nubus/nubus.h" #include "hw/sysbus.h" #include "ui/console.h" diff --git a/include/hw/i2c/npcm7xx_smbus.h b/include/hw/i2c/npcm7xx_smbus.h index 9c544c561b7..f5adb69c672 100644 --- a/include/hw/i2c/npcm7xx_smbus.h +++ b/include/hw/i2c/npcm7xx_smbus.h @@ -18,7 +18,7 @@ =20 #include "system/memory.h" #include "hw/i2c/i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" =20 /* diff --git a/include/hw/ide/ahci-pci.h b/include/hw/ide/ahci-pci.h index face1a9a4a4..85cd899abe5 100644 --- a/include/hw/ide/ahci-pci.h +++ b/include/hw/ide/ahci-pci.h @@ -9,7 +9,7 @@ #include "qom/object.h" #include "hw/ide/ahci.h" #include "hw/pci/pci_device.h" -#include "hw/irq.h" +#include "hw/core/irq.h" =20 #define TYPE_ICH9_AHCI "ich9-ahci" OBJECT_DECLARE_SIMPLE_TYPE(AHCIPCIState, ICH9_AHCI) diff --git a/include/hw/input/pl050.h b/include/hw/input/pl050.h index 4cb8985f31a..db662654c58 100644 --- a/include/hw/input/pl050.h +++ b/include/hw/input/pl050.h @@ -13,7 +13,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/input/ps2.h" -#include "hw/irq.h" +#include "hw/core/irq.h" =20 struct PL050DeviceClass { SysBusDeviceClass parent_class; diff --git a/include/hw/ipack/ipack.h b/include/hw/ipack/ipack.h index 00f397fd020..d86ef84233c 100644 --- a/include/hw/ipack/ipack.h +++ b/include/hw/ipack/ipack.h @@ -12,7 +12,7 @@ #define QEMU_IPACK_H =20 #include "hw/qdev-core.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qom/object.h" =20 =20 diff --git a/include/hw/misc/bcm2835_mphi.h b/include/hw/misc/bcm2835_mphi.h index 3f1997e5f24..1a451685e8e 100644 --- a/include/hw/misc/bcm2835_mphi.h +++ b/include/hw/misc/bcm2835_mphi.h @@ -17,7 +17,7 @@ #ifndef HW_MISC_BCM2835_MPHI_H #define HW_MISC_BCM2835_MPHI_H =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "qom/object.h" =20 diff --git a/include/hw/misc/npcm7xx_mft.h b/include/hw/misc/npcm7xx_mft.h index 54a2c2a82e6..79855b6f25d 100644 --- a/include/hw/misc/npcm7xx_mft.h +++ b/include/hw/misc/npcm7xx_mft.h @@ -18,7 +18,7 @@ =20 #include "system/memory.h" #include "hw/core/clock.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "qom/object.h" =20 diff --git a/include/hw/misc/npcm7xx_pwm.h b/include/hw/misc/npcm7xx_pwm.h index f697a77cdca..6a54b40005d 100644 --- a/include/hw/misc/npcm7xx_pwm.h +++ b/include/hw/misc/npcm7xx_pwm.h @@ -18,7 +18,7 @@ =20 #include "hw/core/clock.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" =20 /* Each PWM module holds 4 PWM channels. */ #define NPCM7XX_PWM_PER_MODULE 4 diff --git a/include/hw/misc/xlnx-versal-trng.h b/include/hw/misc/xlnx-vers= al-trng.h index d96f8f9eff3..4e516216dbe 100644 --- a/include/hw/misc/xlnx-versal-trng.h +++ b/include/hw/misc/xlnx-versal-trng.h @@ -26,7 +26,7 @@ #ifndef XLNX_VERSAL_TRNG_H #define XLNX_VERSAL_TRNG_H =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/register.h" =20 diff --git a/include/hw/net/imx_fec.h b/include/hw/net/imx_fec.h index 83b21637eeb..99fc285402c 100644 --- a/include/hw/net/imx_fec.h +++ b/include/hw/net/imx_fec.h @@ -32,7 +32,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(IMXFECState, IMX_FEC) =20 #include "hw/sysbus.h" #include "hw/net/lan9118_phy.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "net/net.h" =20 #define ENET_EIR 1 diff --git a/include/hw/net/npcm7xx_emc.h b/include/hw/net/npcm7xx_emc.h index b789007160a..03c9941d82d 100644 --- a/include/hw/net/npcm7xx_emc.h +++ b/include/hw/net/npcm7xx_emc.h @@ -17,7 +17,7 @@ #ifndef NPCM7XX_EMC_H #define NPCM7XX_EMC_H =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "net/net.h" =20 diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h index 6340ffe92ca..44ee7b1bcba 100644 --- a/include/hw/net/npcm_gmac.h +++ b/include/hw/net/npcm_gmac.h @@ -20,7 +20,7 @@ #ifndef NPCM_GMAC_H #define NPCM_GMAC_H =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "net/net.h" =20 diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h index af90900bfc6..ad2e4a250f5 100644 --- a/include/hw/nvram/xlnx-bbram.h +++ b/include/hw/nvram/xlnx-bbram.h @@ -28,7 +28,7 @@ =20 #include "system/block-backend.h" #include "hw/qdev-core.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/register.h" =20 diff --git a/include/hw/nvram/xlnx-versal-efuse.h b/include/hw/nvram/xlnx-v= ersal-efuse.h index afa4f4f9960..37d09da4809 100644 --- a/include/hw/nvram/xlnx-versal-efuse.h +++ b/include/hw/nvram/xlnx-versal-efuse.h @@ -22,7 +22,7 @@ #ifndef XLNX_VERSAL_EFUSE_H #define XLNX_VERSAL_EFUSE_H =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/register.h" #include "hw/nvram/xlnx-efuse.h" diff --git a/include/hw/nvram/xlnx-zynqmp-efuse.h b/include/hw/nvram/xlnx-z= ynqmp-efuse.h index 7fb12df3fbb..6eb3fea8fa2 100644 --- a/include/hw/nvram/xlnx-zynqmp-efuse.h +++ b/include/hw/nvram/xlnx-zynqmp-efuse.h @@ -22,7 +22,7 @@ #ifndef XLNX_ZYNQMP_EFUSE_H #define XLNX_ZYNQMP_EFUSE_H =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/register.h" #include "hw/nvram/xlnx-efuse.h" diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h index b8de4b06fb1..0ea0dbae8b1 100644 --- a/include/hw/ppc/spapr_vio.h +++ b/include/hw/ppc/spapr_vio.h @@ -24,7 +24,7 @@ =20 #include "hw/ppc/spapr.h" #include "system/dma.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qom/object.h" =20 #define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device" diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 8170836d432..da93611d373 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -8,7 +8,7 @@ #include "qemu/rcu_queue.h" #include "qom/object.h" #include "hw/core/hotplug.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/resettable.h" =20 /** diff --git a/include/hw/timer/bcm2835_systmr.h b/include/hw/timer/bcm2835_s= ystmr.h index a8f605beeb6..93cb3415a68 100644 --- a/include/hw/timer/bcm2835_systmr.h +++ b/include/hw/timer/bcm2835_systmr.h @@ -10,7 +10,7 @@ #define BCM2835_SYSTMR_H =20 #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/timer.h" #include "qom/object.h" =20 diff --git a/include/hw/timer/stellaris-gptm.h b/include/hw/timer/stellaris= -gptm.h index c705508b829..9d663b58dfa 100644 --- a/include/hw/timer/stellaris-gptm.h +++ b/include/hw/timer/stellaris-gptm.h @@ -12,7 +12,7 @@ =20 #include "qom/object.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/core/clock.h" =20 #define TYPE_STELLARIS_GPTM "stellaris-gptm" diff --git a/include/hw/watchdog/sbsa_gwdt.h b/include/hw/watchdog/sbsa_gwd= t.h index 4bdc6c6fdb6..ace8fe04c87 100644 --- a/include/hw/watchdog/sbsa_gwdt.h +++ b/include/hw/watchdog/sbsa_gwdt.h @@ -14,7 +14,7 @@ =20 #include "qemu/bitops.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" =20 #define TYPE_WDT_SBSA "sbsa_gwdt" #define SBSA_GWDT(obj) \ diff --git a/include/hw/watchdog/wdt_imx2.h b/include/hw/watchdog/wdt_imx2.h index 600a552d2e2..ddc49aaea4f 100644 --- a/include/hw/watchdog/wdt_imx2.h +++ b/include/hw/watchdog/wdt_imx2.h @@ -14,7 +14,7 @@ =20 #include "qemu/bitops.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ptimer.h" #include "qom/object.h" =20 diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h index 77b541f83f9..e5c7e0518a5 100644 --- a/rust/hw/core/wrapper.h +++ b/rust/hw/core/wrapper.h @@ -29,4 +29,4 @@ typedef enum memory_order { #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" -#include "hw/irq.h" +#include "hw/core/irq.h" diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 4cb2ea6c84a..e5822fcbb72 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -42,7 +42,7 @@ #include "qemu/event_notifier.h" #include "qemu/main-loop.h" #include "trace.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qapi/visitor.h" #include "qapi/qapi-types-common.h" #include "qapi/qapi-visit-common.h" diff --git a/hw/acpi/core.c b/hw/acpi/core.c index ff165828033..2b74bed8823 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" #include "qemu/config-file.h" diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c index e7b773d84d5..675ec43d094 100644 --- a/hw/acpi/generic_event_device.c +++ b/hw/acpi/generic_event_device.c @@ -15,7 +15,7 @@ #include "hw/acpi/pcihp.h" #include "hw/acpi/generic_event_device.h" #include "hw/pci/pci.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h" #include "hw/pci/pci_device.h" diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 9e0892a51f8..1e3c6345411 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/apm.h" #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" diff --git a/hw/adc/aspeed_adc.c b/hw/adc/aspeed_adc.c index 3e820cae1e3..564979f24dd 100644 --- a/hw/adc/aspeed_adc.c +++ b/hw/adc/aspeed_adc.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/adc/aspeed_adc.h" diff --git a/hw/adc/zynq-xadc.c b/hw/adc/zynq-xadc.c index 748a51ba78b..1934ef0b1a9 100644 --- a/hw/adc/zynq-xadc.c +++ b/hw/adc/zynq-xadc.c @@ -14,7 +14,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/adc/zynq-xadc.h" #include "migration/vmstate.h" #include "qemu/timer.h" diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 4c56f981d71..01fda4b1c8a 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -13,7 +13,7 @@ #include "qapi/error.h" #include "hw/pci/pci_host.h" #include "cpu.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "alpha_sys.h" =20 =20 diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index 50ab7f48105..c0d99182bf9 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -22,7 +22,7 @@ #include "hw/arm/armsse.h" #include "hw/arm/armsse-version.h" #include "hw/arm/boot.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-clock.h" =20 /* diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 76001ff0dfc..2d8e257ca2a 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -26,7 +26,7 @@ #include "exec/tswap.h" #include "cpu.h" #include "hw/cpu/a9mpcore.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "system/blockdev.h" #include "system/system.h" #include "hw/sysbus.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 66af0e2376d..f07dd452fcb 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -34,7 +34,7 @@ #include "hw/net/lan9118.h" #include "hw/qdev-properties.h" #include "hw/core/boards.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "target/arm/cpu-qom.h" =20 #define SMDK_LAN9118_BASE_ADDR 0x05000000 diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 436fcdd5101..b24df11db92 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -24,7 +24,7 @@ #include "qemu/error-report.h" #include "hw/char/pl011.h" #include "hw/hw.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sd/sd.h" #include "qom/object.h" #include "qemu/audio.h" diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 3188caf2228..a0d917f9a9e 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -75,7 +75,7 @@ #include "hw/core/split-irq.h" #include "hw/qdev-clock.h" #include "qom/object.h" -#include "hw/irq.h" +#include "hw/core/irq.h" =20 #define MPS2TZ_NUMIRQ_MAX 96 #define MPS2TZ_RAM_MAX 5 diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 3e624540960..9852e8f7648 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -27,7 +27,7 @@ #include "ui/console.h" #include "hw/i2c/i2c.h" #include "hw/i2c/bitbang_i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/or-irq.h" #include "hw/audio/wm8750.h" #include "system/block-backend.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 74458fb7c69..994e5a919e1 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -25,7 +25,7 @@ #include "cpu.h" #include "system/address-spaces.h" #include "hw/hw.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 97008490f6a..65506768e41 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -27,7 +27,7 @@ #include "hw/char/pl011.h" #include "hw/cpu/a9mpcore.h" #include "hw/intc/realview_gic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/i2c/arm_sbcon_i2c.h" #include "hw/sd/sd.h" #include "qemu/audio.h" diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index bcf8af8dc73..ae4fba15991 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -18,7 +18,7 @@ =20 #include "qemu/osdep.h" #include "qemu/bitops.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/qdev-properties.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index d1cbf43777e..34cbcbe32c2 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -26,7 +26,7 @@ #include "hw/arm/armv7m.h" #include "hw/char/pl011.h" #include "hw/input/stellaris_gamepad.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" #include "migration/vmstate.h" #include "hw/misc/unimp.h" diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 059b07907d8..95dda078522 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -28,7 +28,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index dd1047f6c62..94661b83d00 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -19,7 +19,7 @@ #include "hw/pci/pci.h" #include "hw/i2c/i2c.h" #include "hw/i2c/arm_sbcon_i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/core/boards.h" #include "hw/block/flash.h" #include "qemu/error-report.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 25fb2bab568..6155db2b093 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -68,7 +68,7 @@ #include "hw/intc/arm_gic.h" #include "hw/intc/arm_gicv3_common.h" #include "hw/intc/arm_gicv3_its_common.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "kvm_arm.h" #include "hvf_arm.h" #include "hw/firmware/smbios.h" diff --git a/hw/audio/asc.c b/hw/audio/asc.c index 0abb106979b..b6f42045003 100644 --- a/hw/audio/asc.c +++ b/hw/audio/asc.c @@ -14,7 +14,7 @@ #include "qemu/timer.h" #include "qapi/error.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/audio.h" #include "hw/audio/asc.h" #include "hw/qdev-properties.h" diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index 98fdbc5b725..8368172f401 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/audio/model.h" #include "qemu/audio.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 68f89e994c2..6c41b25486e 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -27,7 +27,7 @@ #include "qemu/module.h" #include "hw/audio/model.h" #include "qemu/audio.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index a483f4e70d1..ba9bd6befd7 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/audio/wm8750.h" #include "qemu/audio.h" diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c index fd3d09611fa..7bb2c81afcd 100644 --- a/hw/audio/pl041.c +++ b/hw/audio/pl041.c @@ -21,7 +21,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/log.h" diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index 1e3c4caf5ef..6ca31a0e649 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/audio/model.h" #include "qemu/audio.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index 6d1790e0e61..0034c3594ae 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -33,7 +33,7 @@ #include "qemu/error-report.h" #include "qemu/timer.h" #include "hw/acpi/acpi_aml_interface.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/hw/block/fdc.c b/hw/block/fdc.c index d0f08c7be54..e0e53ba0382 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -33,7 +33,7 @@ #include "qemu/error-report.h" #include "qemu/timer.h" #include "qemu/memalign.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/hw/char/avr_usart.c b/hw/char/avr_usart.c index fae15217e9f..e98ad53e447 100644 --- a/hw/char/avr_usart.c +++ b/hw/char/avr_usart.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "hw/char/avr_usart.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" =20 diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c index 2b397f2ff39..03428efeea8 100644 --- a/hw/char/bcm2835_aux.c +++ b/hw/char/bcm2835_aux.c @@ -22,7 +22,7 @@ =20 #include "qemu/osdep.h" #include "hw/char/bcm2835_aux.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index 0dfa356b6d0..738ba3114b9 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -30,7 +30,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/char/cadence_uart.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties-system.h" #include "trace.h" diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c index 32090f3516f..a5ec61a0044 100644 --- a/hw/char/cmsdk-apb-uart.c +++ b/hw/char/cmsdk-apb-uart.c @@ -26,7 +26,7 @@ #include "chardev/char-fe.h" #include "chardev/char-serial.h" #include "hw/char/cmsdk-apb-uart.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties-system.h" =20 REG32(DATA, 0) diff --git a/hw/char/diva-gsp.c b/hw/char/diva-gsp.c index e1f0713cb79..835594e5cb6 100644 --- a/hw/char/diva-gsp.c +++ b/hw/char/diva-gsp.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/char/serial.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/hw/char/escc.c b/hw/char/escc.c index afe4ca483e7..27269dca643 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index 9e45d819904..8ba310fd7ac 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -30,7 +30,7 @@ #include "chardev/char-serial.h" =20 #include "hw/arm/exynos4210.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" =20 diff --git a/hw/char/goldfish_tty.c b/hw/char/goldfish_tty.c index a37408adae5..821b3218502 100644 --- a/hw/char/goldfish_tty.c +++ b/hw/char/goldfish_tty.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index b2d5a40bb4d..15925eb2e63 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -25,7 +25,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/char/grlib_uart.h" diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c index d6f0d18c777..db852511091 100644 --- a/hw/char/ibex_uart.c +++ b/hw/char/ibex_uart.c @@ -27,7 +27,7 @@ =20 #include "qemu/osdep.h" #include "hw/char/ibex_uart.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index 509b0141d05..9f13236f29c 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "hw/char/imx_serial.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 25d7fc9574a..6e38916150c 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "hw/ipack/ipack.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" diff --git a/hw/char/max78000_uart.c b/hw/char/max78000_uart.c index c76c0e759b6..5fc933123e9 100644 --- a/hw/char/max78000_uart.c +++ b/hw/char/max78000_uart.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "hw/char/max78000_uart.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/log.h" diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index f14de59530c..d9d551924b3 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -7,7 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c index 41d423446f3..39d144538d1 100644 --- a/hw/char/nrf51_uart.c +++ b/hw/char/nrf51_uart.c @@ -16,7 +16,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/char/nrf51_uart.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 01335d9437d..75fdb8158e4 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/char/pl011.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" diff --git a/hw/char/renesas_sci.c b/hw/char/renesas_sci.c index b9d0ed1c89b..b32e41d5b8a 100644 --- a/hw/char/renesas_sci.c +++ b/hw/char/renesas_sci.c @@ -23,7 +23,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/registerfields.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c index 34f30fb70b8..34608569988 100644 --- a/hw/char/serial-pci-multi.c +++ b/hw/char/serial-pci-multi.c @@ -30,7 +30,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/char/serial.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index 46efabc4cbe..d05d0898998 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -29,7 +29,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/char/serial.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/char/serial.c b/hw/char/serial.c index 03fec3fe75b..11685b397b7 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qemu/bitops.h" #include "hw/char/serial.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "chardev/char-serial.h" #include "qapi/error.h" diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 83227a84a60..ee430dd3d26 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -27,7 +27,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-core.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/hw/char/sifive_uart.c b/hw/char/sifive_uart.c index e7357d585a1..473374d3de1 100644 --- a/hw/char/sifive_uart.c +++ b/hw/char/sifive_uart.c @@ -22,7 +22,7 @@ #include "migration/vmstate.h" #include "chardev/char.h" #include "chardev/char-fe.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/char/sifive_uart.h" #include "hw/qdev-properties-system.h" =20 diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c index 45c30643a74..49bbda03b87 100644 --- a/hw/char/stm32f2xx_usart.c +++ b/hw/char/stm32f2xx_usart.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/char/stm32f2xx_usart.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/log.h" diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c index 60d8ab5a0e5..ce4a35da8f4 100644 --- a/hw/char/stm32l4x5_usart.c +++ b/hw/char/stm32l4x5_usart.c @@ -24,7 +24,7 @@ #include "migration/vmstate.h" #include "hw/char/stm32l4x5_usart.h" #include "hw/core/clock.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index 8feb58a898e..da1ecd249c7 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -26,7 +26,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/char/xilinx_uartlite.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" diff --git a/hw/core/gpio.c b/hw/core/gpio.c index c7c2936fc55..11f26a2f2dd 100644 --- a/hw/core/gpio.c +++ b/hw/core/gpio.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "hw/qdev-core.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qapi/error.h" =20 static NamedGPIOList *qdev_get_named_gpio_list(DeviceState *dev, diff --git a/hw/core/irq.c b/hw/core/irq.c index 0c768f7704e..106805e2417 100644 --- a/hw/core/irq.c +++ b/hw/core/irq.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" #include "qemu/main-loop.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qom/object.h" =20 void qemu_set_irq(qemu_irq irq, int level) diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c index 3942c709939..61006672ad6 100644 --- a/hw/core/or-irq.c +++ b/hw/core/or-irq.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/or-irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 423a3a1d660..f9f56c66aec 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -32,7 +32,7 @@ #include "qapi/visitor.h" #include "qemu/error-report.h" #include "qemu/option.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/core/boards.h" #include "hw/sysbus.h" diff --git a/hw/core/split-irq.c b/hw/core/split-irq.c index f8b48750c5b..d0aaa108eb9 100644 --- a/hw/core/split-irq.c +++ b/hw/core/split-irq.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/split-irq.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index bd36dd94d4a..1a6fb914f3b 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -22,7 +22,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/cpu/a15mpcore.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "system/kvm.h" #include "kvm_arm.h" diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c index 64bebbd19cb..9f8e0f70c49 100644 --- a/hw/cpu/a9mpcore.c +++ b/hw/cpu/a9mpcore.c @@ -12,7 +12,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/cpu/a9mpcore.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/core/cpu.h" #include "target/arm/cpu-qom.h" diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c index 01772e7f77b..1953d12f61b 100644 --- a/hw/cpu/arm11mpcore.c +++ b/hw/cpu/arm11mpcore.c @@ -12,7 +12,7 @@ #include "qemu/module.h" #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" =20 #define ARM11MPCORE_NUM_GIC_PRIORITY_BITS 4 diff --git a/hw/cpu/realview_mpcore.c b/hw/cpu/realview_mpcore.c index 099b71a9ef2..525f03e9e54 100644 --- a/hw/cpu/realview_mpcore.c +++ b/hw/cpu/realview_mpcore.c @@ -13,7 +13,7 @@ #include "qemu/module.h" #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qom/object.h" =20 #define TYPE_REALVIEW_MPCORE_RIRQ "realview_mpcore" diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index 1bb2ee45a01..f8f13b55cb4 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "hw/display/bcm2835_fb.h" #include "hw/hw.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "ui/console.h" #include "framebuffer.h" #include "ui/pixel_ops.h" diff --git a/hw/display/cg3.c b/hw/display/cg3.c index daeef152174..8191237124e 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -30,7 +30,7 @@ #include "ui/console.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/loader.h" #include "hw/qdev-properties.h" #include "qemu/log.h" diff --git a/hw/display/dm163.c b/hw/display/dm163.c index f8340d8275e..e78804693cd 100644 --- a/hw/display/dm163.c +++ b/hw/display/dm163.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/display/dm163.h" #include "ui/console.h" diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 49c180fec0c..8d8062f427c 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/qdev-properties.h" #include "hw/hw.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "ui/console.h" diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index a6ddc21d3e4..10686cd6763 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/hw.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c index 3532a801be2..90a97314541 100644 --- a/hw/display/omap_lcdc.c +++ b/hw/display/omap_lcdc.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "ui/console.h" #include "hw/arm/omap.h" #include "framebuffer.h" diff --git a/hw/display/pl110.c b/hw/display/pl110.c index 09c3c59e0ed..e78a55184e9 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index a248b943a5a..a24e95f0a73 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -28,7 +28,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/display/xlnx_dp.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" =20 #ifndef DEBUG_DP diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c index a2771ddcb52..d07459de2d0 100644 --- a/hw/dma/bcm2835_dma.c +++ b/hw/dma/bcm2835_dma.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/dma/bcm2835_dma.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index 101f91f4a33..2bf9ebad565 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -21,7 +21,7 @@ #include "qemu/log.h" #include "qemu/timer.h" #include "hw/arm/omap.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/arm/soc_dma.h" =20 struct omap_dma_channel_s { diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index 277d9343223..28f79371646 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "hw/dma/pl080.h" #include "hw/hw.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "qapi/error.h" =20 diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index f9c91f924bb..a9e6d2746f0 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -16,7 +16,7 @@ =20 #include "qemu/osdep.h" #include "qemu/cutils.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index b6ed1d46433..8ce74257b62 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/mips/mips.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/dma/sifive_pdma.c b/hw/dma/sifive_pdma.c index 48de3a24785..bae77544b23 100644 --- a/hw/dma/sifive_pdma.c +++ b/hw/dma/sifive_pdma.c @@ -24,7 +24,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 60c23b69e5c..9f56faf9a53 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -26,7 +26,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sparc/sparc32_dma.h" #include "hw/sparc/sun4m_iommu.h" diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 2020399fd59..9b05080ae59 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "hw/hw.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" #include "qemu/log.h" diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c index 0c075e7d0d1..660fc21b6d1 100644 --- a/hw/dma/xlnx-zdma.c +++ b/hw/dma/xlnx-zdma.c @@ -28,7 +28,7 @@ =20 #include "qemu/osdep.h" #include "hw/dma/xlnx-zdma.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/bitops.h" diff --git a/hw/dma/xlnx-zynq-devcfg.c b/hw/dma/xlnx-zynq-devcfg.c index 8141d460338..cf00aa863d5 100644 --- a/hw/dma/xlnx-zynq-devcfg.c +++ b/hw/dma/xlnx-zynq-devcfg.c @@ -26,7 +26,7 @@ =20 #include "qemu/osdep.h" #include "hw/dma/xlnx-zynq-devcfg.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qemu/bitops.h" #include "system/dma.h" diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c index d8c7da1a501..0b1185325ba 100644 --- a/hw/dma/xlnx_csu_dma.c +++ b/hw/dma/xlnx_csu_dma.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c index 3d88ccc8da9..32f56036a4c 100644 --- a/hw/dma/xlnx_dpdma.c +++ b/hw/dma/xlnx_dpdma.c @@ -27,7 +27,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/dma/xlnx_dpdma.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" =20 #ifndef DEBUG_DPDMA diff --git a/hw/gpio/aspeed_gpio.c b/hw/gpio/aspeed_gpio.c index 2d78bf9515c..85a5acd7087 100644 --- a/hw/gpio/aspeed_gpio.c +++ b/hw/gpio/aspeed_gpio.c @@ -13,7 +13,7 @@ #include "hw/misc/aspeed_scu.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "trace.h" #include "hw/registerfields.h" diff --git a/hw/gpio/bcm2835_gpio.c b/hw/gpio/bcm2835_gpio.c index dfb5d5cb578..bd9170b8932 100644 --- a/hw/gpio/bcm2835_gpio.c +++ b/hw/gpio/bcm2835_gpio.c @@ -20,7 +20,7 @@ #include "migration/vmstate.h" #include "hw/sd/sd.h" #include "hw/gpio/bcm2835_gpio.h" -#include "hw/irq.h" +#include "hw/core/irq.h" =20 #define GPFSEL0 0x00 #define GPFSEL1 0x04 diff --git a/hw/gpio/bcm2838_gpio.c b/hw/gpio/bcm2838_gpio.c index 1069e7811bb..dab50faf285 100644 --- a/hw/gpio/bcm2838_gpio.c +++ b/hw/gpio/bcm2838_gpio.c @@ -19,7 +19,7 @@ #include "migration/vmstate.h" #include "hw/sd/sd.h" #include "hw/gpio/bcm2838_gpio.h" -#include "hw/irq.h" +#include "hw/core/irq.h" =20 #define GPFSEL0 0x00 #define GPFSEL1 0x04 diff --git a/hw/gpio/gpio_key.c b/hw/gpio/gpio_key.c index 40c028bed9e..f8cf4da239a 100644 --- a/hw/gpio/gpio_key.c +++ b/hw/gpio/gpio_key.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c index 450ece45482..842c997a2a6 100644 --- a/hw/gpio/imx_gpio.c +++ b/hw/gpio/imx_gpio.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "hw/gpio/imx_gpio.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c index 257497af584..377832e9d24 100644 --- a/hw/gpio/mpc8xxx.c +++ b/hw/gpio/mpc8xxx.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/gpio/npcm7xx_gpio.c b/hw/gpio/npcm7xx_gpio.c index 66f8256a7a7..59b95d232bf 100644 --- a/hw/gpio/npcm7xx_gpio.c +++ b/hw/gpio/npcm7xx_gpio.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" =20 #include "hw/gpio/npcm7xx_gpio.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/gpio/nrf51_gpio.c b/hw/gpio/nrf51_gpio.c index d94c0c47da2..567eb1fe7da 100644 --- a/hw/gpio/nrf51_gpio.c +++ b/hw/gpio/nrf51_gpio.c @@ -14,7 +14,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/gpio/nrf51_gpio.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "trace.h" =20 diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index f27806b774a..547f0a15a27 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" diff --git a/hw/gpio/pca9552.c b/hw/gpio/pca9552.c index 1e10238b2e0..fe1d8dbffa2 100644 --- a/hw/gpio/pca9552.c +++ b/hw/gpio/pca9552.c @@ -17,7 +17,7 @@ #include "hw/qdev-properties.h" #include "hw/gpio/pca9552.h" #include "hw/gpio/pca9552_regs.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/gpio/pca9554.c b/hw/gpio/pca9554.c index eac0d23be34..c6cdd27b3ff 100644 --- a/hw/gpio/pca9554.c +++ b/hw/gpio/pca9554.c @@ -13,7 +13,7 @@ #include "hw/qdev-properties.h" #include "hw/gpio/pca9554.h" #include "hw/gpio/pca9554_regs.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/gpio/pcf8574.c b/hw/gpio/pcf8574.c index 274b44bb616..f871f1e7880 100644 --- a/hw/gpio/pcf8574.c +++ b/hw/gpio/pcf8574.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" #include "hw/gpio/pcf8574.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c index a3ac038c2f7..09b32247127 100644 --- a/hw/gpio/pl061.c +++ b/hw/gpio/pl061.c @@ -30,7 +30,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/gpio/sifive_gpio.c b/hw/gpio/sifive_gpio.c index 5831647b4d0..63ca721fadd 100644 --- a/hw/gpio/sifive_gpio.c +++ b/hw/gpio/sifive_gpio.c @@ -13,7 +13,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/gpio/sifive_gpio.h" #include "migration/vmstate.h" diff --git a/hw/gpio/stm32l4x5_gpio.c b/hw/gpio/stm32l4x5_gpio.c index 42fe984c493..a5a38da6384 100644 --- a/hw/gpio/stm32l4x5_gpio.c +++ b/hw/gpio/stm32l4x5_gpio.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/gpio/stm32l4x5_gpio.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/core/clock.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c index 590ffde89d1..0a9f76e7743 100644 --- a/hw/gpio/zaurus.c +++ b/hw/gpio/zaurus.c @@ -17,7 +17,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/i2c/allwinner-i2c.c b/hw/i2c/allwinner-i2c.c index fe887e1c6a9..c879e5009df 100644 --- a/hw/i2c/allwinner-i2c.c +++ b/hw/i2c/allwinner-i2c.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/i2c/allwinner-i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/i2c/i2c.h" #include "qemu/log.h" diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c index 83fb906bdc7..3d66dd863a1 100644 --- a/hw/i2c/aspeed_i2c.c +++ b/hw/i2c/aspeed_i2c.c @@ -27,7 +27,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/i2c/aspeed_i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/registerfields.h" #include "trace.h" diff --git a/hw/i2c/bcm2835_i2c.c b/hw/i2c/bcm2835_i2c.c index be11cca2a93..34de1f36e5b 100644 --- a/hw/i2c/bcm2835_i2c.c +++ b/hw/i2c/bcm2835_i2c.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/i2c/bcm2835_i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" =20 static void bcm2835_i2c_update_interrupt(BCM2835I2CState *s) diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c index e020f314e2a..d379cfd7751 100644 --- a/hw/i2c/bitbang_i2c.c +++ b/hw/i2c/bitbang_i2c.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/i2c/bitbang_i2c.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c index 9d0c1cdaa8a..dd72dda4fd0 100644 --- a/hw/i2c/exynos4210_i2c.c +++ b/hw/i2c/exynos4210_i2c.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/i2c/i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qom/object.h" =20 #ifndef EXYNOS4_I2C_DEBUG diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c index d26177c85df..88269653e2c 100644 --- a/hw/i2c/imx_i2c.c +++ b/hw/i2c/imx_i2c.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "hw/i2c/imx_i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/i2c/i2c.h" #include "qemu/log.h" diff --git a/hw/i2c/mpc_i2c.c b/hw/i2c/mpc_i2c.c index 25f91b7bc82..e2097f819ce 100644 --- a/hw/i2c/mpc_i2c.c +++ b/hw/i2c/mpc_i2c.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "hw/i2c/i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index 751bf748fd9..6ac151d8515 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -21,7 +21,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/i2c/i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c index 09d4c49d657..d38efd72883 100644 --- a/hw/i2c/ppc4xx_i2c.c +++ b/hw/i2c/ppc4xx_i2c.c @@ -30,7 +30,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/i2c/ppc4xx_i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" =20 #define PPC4xx_I2C_MEM_SIZE 18 =20 diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c index 8a72d6e4dd3..66f37e13039 100644 --- a/hw/i386/kvm/i8259.c +++ b/hw/i386/kvm/i8259.c @@ -15,7 +15,7 @@ #include "hw/intc/i8259.h" #include "qemu/module.h" #include "hw/intc/kvm_irqcount.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "system/kvm.h" #include "qom/object.h" =20 diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c index dd566c49679..a510ab871de 100644 --- a/hw/i386/kvm/xen_evtchn.c +++ b/hw/i386/kvm/xen_evtchn.c @@ -34,7 +34,7 @@ #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/xen/xen_backend_ops.h" =20 #include "xen_evtchn.h" diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 94d22a232ac..e3bafb83af9 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -31,7 +31,7 @@ #include "microvm-dt.h" =20 #include "hw/loader.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/i386/kvm/clock.h" #include "hw/i386/microvm.h" #include "hw/i386/x86.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index f6b9a1bc406..3f8fd078318 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -38,7 +38,7 @@ #include "hw/usb/usb.h" #include "net/net.h" #include "hw/ide/pci.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "system/kvm.h" #include "hw/i386/kvm/clock.h" #include "hw/sysbus.h" diff --git a/hw/i386/port92.c b/hw/i386/port92.c index 39b6f3178fe..48a174316fd 100644 --- a/hw/i386/port92.c +++ b/hw/i386/port92.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "system/runstate.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/isa.h" #include "hw/i386/pc.h" #include "trace.h" diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index c844749900a..27f2f284c81 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -37,7 +37,7 @@ #include "target/i386/sev.h" =20 #include "hw/acpi/cpu_hotplug.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/loader.h" #include "multiboot.h" #include "elf.h" diff --git a/hw/i386/x86-cpu.c b/hw/i386/x86-cpu.c index 1a86a853d5f..276f2b0cdf8 100644 --- a/hw/i386/x86-cpu.c +++ b/hw/i386/x86-cpu.c @@ -28,7 +28,7 @@ #include "hw/i386/x86.h" #include "target/i386/cpu.h" #include "hw/intc/i8259.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "system/kvm.h" =20 /* TSC handling */ diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index ceb2242aa71..591da26d453 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -17,7 +17,7 @@ =20 #include "hw/hw.h" #include "hw/i386/pc.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/i386/apic-msidef.h" #include "hw/xen/xen-x86.h" #include "qemu/range.h" diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 14bc66fb7fa..08f51c8e361 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -22,7 +22,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" =20 #include "qemu/error-report.h" diff --git a/hw/ide/core.c b/hw/ide/core.c index 8c380abf7c1..b45abf067b2 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -24,7 +24,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" #include "qemu/error-report.h" diff --git a/hw/ide/macio.c b/hw/ide/macio.c index c23bf32d2b1..07db7dc34aa 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -24,7 +24,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ppc/mac_dbdma.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 1e50bb9e483..7ce1ae67ab2 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -24,7 +24,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "system/dma.h" diff --git a/hw/ide/via.c b/hw/ide/via.c index dedc2674c00..3a77d744caf 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -32,7 +32,7 @@ #include "system/dma.h" #include "hw/isa/vt82c686.h" #include "hw/ide/pci.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "ide-internal.h" #include "trace.h" =20 diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index de625723c78..70a179907ca 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -31,7 +31,7 @@ #include "trace.h" #include "system/address-spaces.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qapi/error.h" =20 =20 diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 71f5f976e9c..48b457cac76 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -31,7 +31,7 @@ #include "migration/vmstate.h" #include "hw/acpi/acpi_aml_interface.h" #include "hw/input/ps2.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/input/i8042.h" #include "hw/qdev-properties.h" #include "system/reset.h" diff --git a/hw/input/pl050.c b/hw/input/pl050.c index c5f4a3fa843..cb8efc74f77 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -20,7 +20,7 @@ #include "migration/vmstate.h" #include "hw/input/ps2.h" #include "hw/input/pl050.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/log.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 7f7b1fce2e5..96850124a7b 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/input/ps2.h" #include "migration/vmstate.h" diff --git a/hw/input/stellaris_gamepad.c b/hw/input/stellaris_gamepad.c index fec1161c9c1..bd80db6fac5 100644 --- a/hw/input/stellaris_gamepad.c +++ b/hw/input/stellaris_gamepad.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/input/stellaris_gamepad.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "ui/console.h" diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c index 04097341557..0e1ec521e42 100644 --- a/hw/intc/allwinner-a10-pic.c +++ b/hw/intc/allwinner-a10-pic.c @@ -19,7 +19,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/intc/allwinner-a10-pic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/log.h" #include "qemu/module.h" =20 diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index 899f1333633..e27bb20bf8c 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -19,7 +19,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "gic_internal.h" #include "qapi/error.h" diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c index cef06882216..e823fcc97fc 100644 --- a/hw/intc/arm_gicv2m.c +++ b/hw/intc/arm_gicv2m.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/msi.h" #include "hw/qdev-properties.h" #include "system/kvm.h" diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c index 2e6c1f778a9..eaf1e512ede 100644 --- a/hw/intc/arm_gicv3_cpuif.c +++ b/hw/intc/arm_gicv3_cpuif.c @@ -18,7 +18,7 @@ #include "qemu/main-loop.h" #include "trace.h" #include "gicv3_internal.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "cpu.h" #include "target/arm/cpregs.h" #include "target/arm/cpu-features.h" diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 7c78961040e..bb39a690a59 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -16,7 +16,7 @@ #include "migration/vmstate.h" #include "qemu/timer.h" #include "hw/intc/armv7m_nvic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "system/tcg.h" #include "system/runstate.h" diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c index 5cd786dee6c..d92305b9ca1 100644 --- a/hw/intc/aspeed_intc.c +++ b/hw/intc/aspeed_intc.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "hw/intc/aspeed_intc.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/log.h" #include "trace.h" #include "hw/registerfields.h" diff --git a/hw/intc/aspeed_vic.c b/hw/intc/aspeed_vic.c index 7120088454c..b0a9a397055 100644 --- a/hw/intc/aspeed_vic.c +++ b/hw/intc/aspeed_vic.c @@ -29,7 +29,7 @@ =20 #include "qemu/osdep.h" #include "hw/intc/aspeed_vic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/intc/bcm2835_ic.c b/hw/intc/bcm2835_ic.c index 55e0a5a503b..71bf671761b 100644 --- a/hw/intc/bcm2835_ic.c +++ b/hw/intc/bcm2835_ic.c @@ -14,7 +14,7 @@ =20 #include "qemu/osdep.h" #include "hw/intc/bcm2835_ic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/bcm2836_control.c b/hw/intc/bcm2836_control.c index 1c028536696..f1deafaf7a2 100644 --- a/hw/intc/bcm2836_control.c +++ b/hw/intc/bcm2836_control.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "hw/intc/bcm2836_control.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index ebbe23436f4..b9e74d19c37 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -34,7 +34,7 @@ #include "hw/intc/exynos4210_combiner.h" #include "hw/arm/exynos4210.h" #include "hw/hw.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "qom/object.h" =20 diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index 7e2d79d00cd..5b156f7ef5a 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -25,7 +25,7 @@ #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/intc/exynos4210_gic.h" #include "hw/arm/exynos4210.h" diff --git a/hw/intc/goldfish_pic.c b/hw/intc/goldfish_pic.c index 2359861785d..7aaccba75ae 100644 --- a/hw/intc/goldfish_pic.c +++ b/hw/intc/goldfish_pic.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c index e0f26466ba3..bb2ee5f8015 100644 --- a/hw/intc/grlib_irqmp.c +++ b/hw/intc/grlib_irqmp.c @@ -27,7 +27,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" =20 #include "hw/qdev-properties.h" diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c index 447e8c25d8d..b65ec04e475 100644 --- a/hw/intc/heathrow_pic.c +++ b/hw/intc/heathrow_pic.c @@ -27,7 +27,7 @@ #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/intc/heathrow_pic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "trace.h" =20 static inline int heathrow_check_irq(HeathrowPICState *pic) diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index b6f96bf208c..8f2aa1f0fb1 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/intc/i8259.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/isa.h" #include "qemu/timer.h" #include "qemu/log.h" diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c index 09c3bfac0b6..a3d71aba8ef 100644 --- a/hw/intc/imx_avic.c +++ b/hw/intc/imx_avic.c @@ -17,7 +17,7 @@ =20 #include "qemu/osdep.h" #include "hw/intc/imx_avic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/loongarch_dintc.c b/hw/intc/loongarch_dintc.c index 32bdd171c58..082755d28bb 100644 --- a/hw/intc/loongarch_dintc.c +++ b/hw/intc/loongarch_dintc.c @@ -7,7 +7,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/intc/loongarch_pch_msi.h" #include "hw/intc/loongarch_pch_pic.h" #include "hw/intc/loongarch_dintc.h" diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c index 3e9c88d1d9c..29997402694 100644 --- a/hw/intc/loongarch_extioi.c +++ b/hw/intc/loongarch_extioi.c @@ -9,7 +9,7 @@ #include "qemu/module.h" #include "qemu/log.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/loongarch/virt.h" #include "system/address-spaces.h" #include "system/kvm.h" diff --git a/hw/intc/loongarch_pch_msi.c b/hw/intc/loongarch_pch_msi.c index f6d163158da..63090b27261 100644 --- a/hw/intc/loongarch_pch_msi.c +++ b/hw/intc/loongarch_pch_msi.c @@ -7,7 +7,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/intc/loongarch_pch_msi.h" #include "hw/intc/loongarch_pch_pic.h" #include "hw/pci/msi.h" diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c index 32f01aabf0e..82e16be3918 100644 --- a/hw/intc/loongarch_pch_pic.c +++ b/hw/intc/loongarch_pch_pic.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qemu/bitops.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/intc/loongarch_pch_pic.h" #include "system/kvm.h" #include "trace.h" diff --git a/hw/intc/loongson_ipi_common.c b/hw/intc/loongson_ipi_common.c index 8cd78d48589..b3d8e781ca1 100644 --- a/hw/intc/loongson_ipi_common.c +++ b/hw/intc/loongson_ipi_common.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/intc/loongson_ipi_common.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/log.h" #include "migration/vmstate.h" #include "system/kvm.h" diff --git a/hw/intc/loongson_liointc.c b/hw/intc/loongson_liointc.c index c10fb97a063..4c24f330ed7 100644 --- a/hw/intc/loongson_liointc.c +++ b/hw/intc/loongson_liointc.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/intc/loongson_liointc.h" =20 diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index 0c50ba41f62..08925fe1e41 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -19,7 +19,7 @@ #include "system/reset.h" #include "kvm_mips.h" #include "hw/intc/mips_gic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" =20 static void mips_gic_set_vp_irq(MIPSGICState *gic, int vp, int pin) diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index c61158bddd3..7b23b6d2cec 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -19,7 +19,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c index 047c367478d..5a630bd51cb 100644 --- a/hw/intc/ompic.c +++ b/hw/intc/ompic.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index 87733eb7c30..edac46227f5 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -31,7 +31,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci.h" #include "hw/ppc/openpic.h" #include "hw/ppc/ppc_e500.h" diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c index 838c21c4a02..f1e4959e9ae 100644 --- a/hw/intc/pl190.c +++ b/hw/intc/pl190.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/intc/ppc-uic.c b/hw/intc/ppc-uic.c index bc4dc90ade1..bfc4a4fbceb 100644 --- a/hw/intc/ppc-uic.c +++ b/hw/intc/ppc-uic.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/intc/ppc-uic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" =20 diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c index 63e25c2a781..ecaf8201fd6 100644 --- a/hw/intc/realview_gic.c +++ b/hw/intc/realview_gic.c @@ -11,7 +11,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/intc/realview_gic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" =20 static void realview_gic_set_irq(void *opaque, int irq, int level) diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c index c6f13f647ec..f3e37df47d1 100644 --- a/hw/intc/riscv_aclint.c +++ b/hw/intc/riscv_aclint.c @@ -32,7 +32,7 @@ #include "hw/qdev-properties.h" #include "hw/intc/riscv_aclint.h" #include "qemu/timer.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" =20 typedef struct riscv_aclint_mtimer_callback { diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c index a559664c40b..580622d1712 100644 --- a/hw/intc/riscv_aplic.c +++ b/hw/intc/riscv_aplic.c @@ -28,7 +28,7 @@ #include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/intc/riscv_aplic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "target/riscv/cpu.h" #include "system/system.h" #include "system/kvm.h" diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c index 513e38d9c12..54e72b81e78 100644 --- a/hw/intc/riscv_imsic.c +++ b/hw/intc/riscv_imsic.c @@ -28,7 +28,7 @@ #include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "hw/intc/riscv_imsic.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "target/riscv/cpu.h" #include "target/riscv/cpu_bits.h" #include "system/system.h" diff --git a/hw/intc/rx_icu.c b/hw/intc/rx_icu.c index f8615527b75..84712e2e4d0 100644 --- a/hw/intc/rx_icu.c +++ b/hw/intc/rx_icu.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/error-report.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/registerfields.h" #include "hw/qdev-properties.h" #include "hw/intc/rx_icu.h" diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c index c9b0b0c1ecc..16e4b619d6d 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -12,7 +12,7 @@ #include "qemu/log.h" #include "cpu.h" #include "hw/sh4/sh_intc.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sh4/sh.h" #include "trace.h" =20 diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c index 3160b216fdc..c578b6e36d2 100644 --- a/hw/intc/sifive_plic.c +++ b/hw/intc/sifive_plic.c @@ -29,7 +29,7 @@ #include "hw/intc/sifive_plic.h" #include "target/riscv/cpu.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "system/kvm.h" =20 static bool addr_between(uint32_t addr, uint32_t base, uint32_t num) diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c index 00b80bb177c..b12c8cbd69f 100644 --- a/hw/intc/slavio_intctl.c +++ b/hw/intc/slavio_intctl.c @@ -27,7 +27,7 @@ #include "qemu/module.h" #include "hw/sysbus.h" #include "hw/intc/intc.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "trace.h" #include "qom/object.h" =20 diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 200710eb6ca..e87c0ad2bcd 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -36,7 +36,7 @@ #include "qapi/visitor.h" #include "migration/vmstate.h" #include "hw/intc/intc.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "system/kvm.h" #include "system/reset.h" #include "target/ppc/cpu.h" diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index 5257ad54b17..f5a59d89830 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -29,7 +29,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "qemu/module.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qom/object.h" diff --git a/hw/intc/xive.c b/hw/intc/xive.c index e0ffcf89ebf..6f9babf601c 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -16,7 +16,7 @@ #include "system/reset.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ppc/xive.h" #include "hw/ppc/xive2.h" #include "hw/ppc/xive_regs.h" diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c index 9200585e325..098c1f327cd 100644 --- a/hw/intc/xlnx-pmu-iomod-intc.c +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -32,7 +32,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" =20 #ifndef XLNX_PMU_IO_INTC_ERR_DEBUG diff --git a/hw/intc/xlnx-zynqmp-ipi.c b/hw/intc/xlnx-zynqmp-ipi.c index 610cd0e3164..99566bc2e20 100644 --- a/hw/intc/xlnx-zynqmp-ipi.c +++ b/hw/intc/xlnx-zynqmp-ipi.c @@ -33,7 +33,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/intc/xlnx-zynqmp-ipi.h" -#include "hw/irq.h" +#include "hw/core/irq.h" =20 #ifndef XLNX_ZYNQMP_IPI_ERR_DEBUG #define XLNX_ZYNQMP_IPI_ERR_DEBUG 0 diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c index ab602bff734..4a710eb1876 100644 --- a/hw/ipack/ipack.c +++ b/hw/ipack/ipack.c @@ -12,7 +12,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/ipack/ipack.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" =20 diff --git a/hw/ipack/tpci200.c b/hw/ipack/tpci200.c index 40b30517c75..b074b8727dc 100644 --- a/hw/ipack/tpci200.c +++ b/hw/ipack/tpci200.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/ipack/ipack.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "migration/vmstate.h" #include "qemu/bitops.h" diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index 0ad91ccf689..2b26f9c9f0f 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ipmi/ipmi_bt.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index 418d234e0f1..14e85e6e9fd 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ipmi/ipmi_kcs.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 06e8f0ce3e0..dfa8a3775cf 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci_device.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/intc/i8259.h" #include "hw/timer/i8254.h" #include "migration/vmstate.h" diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index c9cb8f77799..6e772eca573 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -37,7 +37,7 @@ #include "hw/dma/i8257.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/apm.h" #include "hw/pci/pci.h" #include "hw/southbridge/ich9.h" diff --git a/hw/isa/piix.c b/hw/isa/piix.c index 52c14d3cd5b..bf1c79a3e63 100644 --- a/hw/isa/piix.c +++ b/hw/isa/piix.c @@ -29,7 +29,7 @@ #include "hw/dma/i8257.h" #include "hw/southbridge/piix.h" #include "hw/timer/i8254.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/ide/piix.h" #include "hw/intc/i8259.h" diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 337958617a4..1362a1f4042 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -24,7 +24,7 @@ #include "hw/isa/isa.h" #include "hw/isa/superio.h" #include "hw/intc/i8259.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/dma/i8257.h" #include "hw/usb/hcd-uhci.h" #include "hw/timer/i8254.h" diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index a78a9bc03d8..0e11eb340f0 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -20,7 +20,7 @@ #include "system/rtc.h" #include "hw/loongarch/virt.h" #include "system/address-spaces.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "net/net.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index 6359aa81d0e..4cf86d510b3 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -12,7 +12,7 @@ #include "cpu.h" #include "hw/qdev-properties.h" #include "hw/core/boards.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/m68k/mcf.h" #include "qemu/timer.h" #include "hw/ptimer.h" diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index c1067435bf8..b2b02f25ff1 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -21,7 +21,7 @@ #include "qapi/error.h" #include "qemu/datadir.h" #include "cpu.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/m68k/mcf.h" #include "hw/m68k/mcf_fec.h" #include "qemu/timer.h" diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c index e3055b841e8..efac6802a97 100644 --- a/hw/m68k/mcf_intc.c +++ b/hw/m68k/mcf_intc.c @@ -11,7 +11,7 @@ #include "qemu/module.h" #include "qemu/log.h" #include "cpu.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/m68k/mcf.h" #include "hw/qdev-properties.h" diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index d7c460bcd4b..1411436a463 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -15,7 +15,7 @@ #include "exec/cpu-interrupt.h" #include "system/system.h" #include "system/qtest.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/m68k/next-cube.h" #include "hw/core/boards.h" #include "hw/loader.h" diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c index d663d124fce..94f47175ae5 100644 --- a/hw/m68k/q800-glue.c +++ b/hw/m68k/q800-glue.c @@ -24,7 +24,7 @@ #include "cpu.h" #include "hw/m68k/q800-glue.h" #include "hw/core/boards.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/nmi.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 44ae8bc6c72..c63d77d4cca 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -43,7 +43,7 @@ #include "hw/pci/pci_bus.h" #include "qemu/log.h" #include "hw/ide/pci.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/loader.h" #include "elf.h" #include "qom/object.h" diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c index 26fdb934f50..2b740afc4d8 100644 --- a/hw/mips/mips_int.c +++ b/hw/mips/mips_int.c @@ -22,7 +22,7 @@ =20 #include "qemu/osdep.h" #include "qemu/main-loop.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "system/kvm.h" #include "kvm_mips.h" =20 diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index 0f4e37cd474..8995eaeec36 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "qemu/timer.h" #include "system/runstate.h" diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c index d5d307a186c..2673c2de3ef 100644 --- a/hw/misc/armsse-mhu.c +++ b/hw/misc/armsse-mhu.c @@ -23,7 +23,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/registerfields.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/armsse-mhu.h" =20 REG32(CPU0INTR_STAT, 0x0) diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c index 726368fbbc2..51c73ca2a52 100644 --- a/hw/misc/aspeed_hace.c +++ b/hw/misc/aspeed_hace.c @@ -19,7 +19,7 @@ #include "migration/vmstate.h" #include "crypto/hash.h" #include "hw/qdev-properties.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "trace.h" =20 #define R_CRYPT_CMD (0x10 / 4) diff --git a/hw/misc/aspeed_lpc.c b/hw/misc/aspeed_lpc.c index 78406dae248..829955e6f16 100644 --- a/hw/misc/aspeed_lpc.c +++ b/hw/misc/aspeed_lpc.c @@ -13,7 +13,7 @@ #include "hw/misc/aspeed_lpc.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" =20 diff --git a/hw/misc/aspeed_peci.c b/hw/misc/aspeed_peci.c index a7a449a9236..cf902a8ab8c 100644 --- a/hw/misc/aspeed_peci.c +++ b/hw/misc/aspeed_peci.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/aspeed_peci.h" #include "hw/registerfields.h" #include "trace.h" diff --git a/hw/misc/aspeed_xdma.c b/hw/misc/aspeed_xdma.c index cc03c422b0e..3bc272d39c5 100644 --- a/hw/misc/aspeed_xdma.c +++ b/hw/misc/aspeed_xdma.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/error-report.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/aspeed_xdma.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/misc/avr_power.c b/hw/misc/avr_power.c index 411f016c997..947304ed3b6 100644 --- a/hw/misc/avr_power.c +++ b/hw/misc/avr_power.c @@ -26,7 +26,7 @@ #include "hw/misc/avr_power.h" #include "qemu/log.h" #include "hw/qdev-properties.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "trace.h" =20 static void avr_mask_reset(DeviceState *dev) diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c index 603eaaa710d..ac37fe99571 100644 --- a/hw/misc/bcm2835_mbox.c +++ b/hw/misc/bcm2835_mbox.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/bcm2835_mbox.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c index a21c6a541c0..2026294ce12 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -10,7 +10,7 @@ #include "hw/misc/bcm2835_property.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/bcm2835_mbox_defs.h" #include "hw/arm/raspberrypi-fw-defs.h" #include "system/dma.h" diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c index 81fc536131c..71243ba5bad 100644 --- a/hw/misc/eccmemctl.c +++ b/hw/misc/eccmemctl.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/misc/imx_rngc.c b/hw/misc/imx_rngc.c index 630f6cb54b5..9f49bbcc2e7 100644 --- a/hw/misc/imx_rngc.c +++ b/hw/misc/imx_rngc.c @@ -15,7 +15,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/guest-random.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/imx_rngc.h" #include "migration/vmstate.h" =20 diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c index afd9ab48df7..f8a2946191d 100644 --- a/hw/misc/iotkit-secctl.c +++ b/hw/misc/iotkit-secctl.c @@ -17,7 +17,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/registerfields.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/iotkit-secctl.h" #include "hw/arm/armsse-version.h" #include "hw/qdev-properties.h" diff --git a/hw/misc/ivshmem-flat.c b/hw/misc/ivshmem-flat.c index 27ee8c92183..790500d34de 100644 --- a/hw/misc/ivshmem-flat.c +++ b/hw/misc/ivshmem-flat.c @@ -13,7 +13,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" diff --git a/hw/misc/lasi.c b/hw/misc/lasi.c index 6684f16fd75..e8e1578b751 100644 --- a/hw/misc/lasi.c +++ b/hw/misc/lasi.c @@ -14,7 +14,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "trace.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "system/system.h" #include "system/runstate.h" #include "migration/vmstate.h" diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index bc37e2a2cb7..13ccd3023fb 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -19,7 +19,7 @@ #include "system/address-spaces.h" #include "migration/vmstate.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/timer.h" #include "hw/misc/mac_via.h" #include "hw/misc/mos6522.h" diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index bcd00c9bb1b..3b8dd462f56 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -24,7 +24,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/misc/macio/cuda.h" diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c index 990551f91f4..9fed4265676 100644 --- a/hw/misc/macio/gpio.c +++ b/hw/misc/macio/gpio.c @@ -28,7 +28,7 @@ #include "migration/vmstate.h" #include "hw/misc/macio/macio.h" #include "hw/misc/macio/gpio.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/nmi.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c index b2b42dd5622..a55c9c99824 100644 --- a/hw/misc/macio/mac_dbdma.c +++ b/hw/misc/macio/mac_dbdma.c @@ -38,7 +38,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ppc/mac_dbdma.h" #include "migration/vmstate.h" #include "qemu/main-loop.h" diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index 37349139948..73e64306b86 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -31,7 +31,7 @@ #include "qemu/osdep.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/macio/pmu.h" #include "qemu/timer.h" #include "system/runstate.h" diff --git a/hw/misc/max78000_aes.c b/hw/misc/max78000_aes.c index d883ddd2b61..65846757332 100644 --- a/hw/misc/max78000_aes.c +++ b/hw/misc/max78000_aes.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/misc/max78000_aes.h" #include "crypto/aes.h" diff --git a/hw/misc/max78000_gcr.c b/hw/misc/max78000_gcr.c index fbbc92cca32..6d2e2bd6176 100644 --- a/hw/misc/max78000_gcr.c +++ b/hw/misc/max78000_gcr.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "system/runstate.h" #include "migration/vmstate.h" #include "hw/qdev-properties.h" diff --git a/hw/misc/max78000_icc.c b/hw/misc/max78000_icc.c index 6f7d2b20bf5..622baa5719d 100644 --- a/hw/misc/max78000_icc.c +++ b/hw/misc/max78000_icc.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/misc/max78000_icc.h" =20 diff --git a/hw/misc/max78000_trng.c b/hw/misc/max78000_trng.c index ecdaef53b6c..1435138344d 100644 --- a/hw/misc/max78000_trng.c +++ b/hw/misc/max78000_trng.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/misc/max78000_trng.h" #include "qemu/guest-random.h" diff --git a/hw/misc/mchp_pfsoc_ioscb.c b/hw/misc/mchp_pfsoc_ioscb.c index 10fc7ea2a95..84e957244e5 100644 --- a/hw/misc/mchp_pfsoc_ioscb.c +++ b/hw/misc/mchp_pfsoc_ioscb.c @@ -24,7 +24,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/misc/mchp_pfsoc_ioscb.h" =20 diff --git a/hw/misc/mchp_pfsoc_sysreg.c b/hw/misc/mchp_pfsoc_sysreg.c index f47c835f80d..2a415151037 100644 --- a/hw/misc/mchp_pfsoc_sysreg.c +++ b/hw/misc/mchp_pfsoc_sysreg.c @@ -24,7 +24,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/misc/mchp_pfsoc_sysreg.h" #include "system/runstate.h" diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index 8dd6b82ac5f..728931883d8 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -25,7 +25,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/mos6522.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index a9a5d4a535b..ea9cad85dc2 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -23,7 +23,7 @@ #include "qemu/bitops.h" #include "trace.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/misc/mps2-scc.h" diff --git a/hw/misc/npcm7xx_mft.c b/hw/misc/npcm7xx_mft.c index b35e971fe53..514d29f2015 100644 --- a/hw/misc/npcm7xx_mft.c +++ b/hw/misc/npcm7xx_mft.c @@ -15,7 +15,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/misc/npcm7xx_mft.h" diff --git a/hw/misc/npcm7xx_pwm.c b/hw/misc/npcm7xx_pwm.c index 2de18d09b82..2e72d1c7d4f 100644 --- a/hw/misc/npcm7xx_pwm.c +++ b/hw/misc/npcm7xx_pwm.c @@ -15,7 +15,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/misc/npcm7xx_pwm.h" diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c index 8cd7ffe3f55..0254fb377a6 100644 --- a/hw/misc/nrf51_rng.c +++ b/hw/misc/nrf51_rng.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "hw/arm/nrf51.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/nrf51_rng.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c index da95c4ace58..37afef09903 100644 --- a/hw/misc/omap_clk.c +++ b/hw/misc/omap_clk.c @@ -21,7 +21,7 @@ =20 #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/arm/omap.h" =20 struct clk { diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c index 67c486f347c..4093cb3c99c 100644 --- a/hw/misc/pc-testdev.c +++ b/hw/misc/pc-testdev.c @@ -37,7 +37,7 @@ =20 #include "qemu/osdep.h" #include "qemu/module.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/isa.h" #include "qom/object.h" =20 diff --git a/hw/misc/sifive_e_aon.c b/hw/misc/sifive_e_aon.c index 6eef38d622a..9b1e7baf95e 100644 --- a/hw/misc/sifive_e_aon.c +++ b/hw/misc/sifive_e_aon.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/timer.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/registerfields.h" #include "hw/misc/sifive_e_aon.h" #include "qapi/visitor.h" diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c index a034df3592f..43ce5d0bc97 100644 --- a/hw/misc/slavio_misc.c +++ b/hw/misc/slavio_misc.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/misc/stm32_rcc.c b/hw/misc/stm32_rcc.c index 5815b3efa54..74ea29b1560 100644 --- a/hw/misc/stm32_rcc.c +++ b/hw/misc/stm32_rcc.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/misc/stm32_rcc.h" =20 diff --git a/hw/misc/stm32f4xx_exti.c b/hw/misc/stm32f4xx_exti.c index 0688e6e73ec..a9d396c5dcf 100644 --- a/hw/misc/stm32f4xx_exti.c +++ b/hw/misc/stm32f4xx_exti.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/misc/stm32f4xx_exti.h" =20 diff --git a/hw/misc/stm32f4xx_syscfg.c b/hw/misc/stm32f4xx_syscfg.c index addfb031e88..57e89a13aaa 100644 --- a/hw/misc/stm32f4xx_syscfg.c +++ b/hw/misc/stm32f4xx_syscfg.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/misc/stm32f4xx_syscfg.h" =20 diff --git a/hw/misc/stm32l4x5_exti.c b/hw/misc/stm32l4x5_exti.c index 9c002164c82..8de4568de70 100644 --- a/hw/misc/stm32l4x5_exti.c +++ b/hw/misc/stm32l4x5_exti.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/misc/stm32l4x5_exti.h" =20 diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c index 514159777a0..d4af2cd6963 100644 --- a/hw/misc/stm32l4x5_rcc.c +++ b/hw/misc/stm32l4x5_rcc.c @@ -24,7 +24,7 @@ #include "hw/misc/stm32l4x5_rcc.h" #include "hw/misc/stm32l4x5_rcc_internals.h" #include "hw/core/clock.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/hw/misc/stm32l4x5_syscfg.c b/hw/misc/stm32l4x5_syscfg.c index 85be226d2f4..de488a46780 100644 --- a/hw/misc/stm32l4x5_syscfg.c +++ b/hw/misc/stm32l4x5_syscfg.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/core/clock.h" #include "hw/qdev-clock.h" diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c index a158d4a2944..d922639da17 100644 --- a/hw/misc/tz-mpc.c +++ b/hw/misc/tz-mpc.c @@ -17,7 +17,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/registerfields.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/tz-mpc.h" #include "hw/qdev-properties.h" =20 diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c index af0cc5d4718..74c31f6d7d2 100644 --- a/hw/misc/tz-msc.c +++ b/hw/misc/tz-msc.c @@ -17,7 +17,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/registerfields.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/tz-msc.h" #include "hw/qdev-properties.h" =20 diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c index e4235a846d4..2ab03fa9730 100644 --- a/hw/misc/tz-ppc.c +++ b/hw/misc/tz-ppc.c @@ -17,7 +17,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/registerfields.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/tz-ppc.h" #include "hw/qdev-properties.h" =20 diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-= reg.c index 95e167b9213..616c0ecf837 100644 --- a/hw/misc/xlnx-versal-cframe-reg.c +++ b/hw/misc/xlnx-versal-cframe-reg.c @@ -18,7 +18,7 @@ #include "qapi/error.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/xlnx-versal-cframe-reg.h" =20 #ifndef XLNX_VERSAL_CFRAME_REG_ERR_DEBUG diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c index b920fc77c3f..ce58404eb2c 100644 --- a/hw/misc/xlnx-versal-cfu.c +++ b/hw/misc/xlnx-versal-cfu.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/units.h" diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c index 5987f32c716..8f9a40d941d 100644 --- a/hw/misc/xlnx-versal-crl.c +++ b/hw/misc/xlnx-versal-crl.c @@ -11,7 +11,7 @@ #include "migration/vmstate.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/register.h" #include "hw/resettable.h" =20 diff --git a/hw/misc/xlnx-versal-pmc-iou-slcr.c b/hw/misc/xlnx-versal-pmc-i= ou-slcr.c index d76df468d49..c75800c1b3c 100644 --- a/hw/misc/xlnx-versal-pmc-iou-slcr.c +++ b/hw/misc/xlnx-versal-pmc-iou-slcr.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "migration/vmstate.h" diff --git a/hw/misc/xlnx-versal-xramc.c b/hw/misc/xlnx-versal-xramc.c index d90f3e87c74..af58bc761f3 100644 --- a/hw/misc/xlnx-versal-xramc.c +++ b/hw/misc/xlnx-versal-xramc.c @@ -13,7 +13,7 @@ #include "hw/sysbus.h" #include "hw/register.h" #include "hw/qdev-properties.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/xlnx-versal-xramc.h" =20 #ifndef XLNX_XRAM_CTRL_ERR_DEBUG diff --git a/hw/misc/xlnx-zynqmp-apu-ctrl.c b/hw/misc/xlnx-zynqmp-apu-ctrl.c index 08777496d56..196e2452ae3 100644 --- a/hw/misc/xlnx-zynqmp-apu-ctrl.c +++ b/hw/misc/xlnx-zynqmp-apu-ctrl.c @@ -14,7 +14,7 @@ #include "migration/vmstate.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/register.h" =20 #include "qemu/bitops.h" diff --git a/hw/misc/xlnx-zynqmp-crf.c b/hw/misc/xlnx-zynqmp-crf.c index d9c1bd50e4f..841bce2231c 100644 --- a/hw/misc/xlnx-zynqmp-crf.c +++ b/hw/misc/xlnx-zynqmp-crf.c @@ -12,7 +12,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/xlnx-zynqmp-crf.h" #include "target/arm/arm-powerctl.h" =20 diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c index 30a81576b4c..a4824d61bda 100644 --- a/hw/net/allwinner-sun8i-emac.c +++ b/hw/net/allwinner-sun8i-emac.c @@ -23,7 +23,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c index 77d089d9887..9158c77cb4f 100644 --- a/hw/net/allwinner_emac.c +++ b/hw/net/allwinner_emac.c @@ -22,7 +22,7 @@ #include "migration/vmstate.h" #include "net/net.h" #include "qemu/fifo8.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/net/allwinner_emac.h" #include "hw/qdev-properties.h" #include "qemu/log.h" diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 44896f1801b..ef72821f8d7 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include /* for crc32 */ =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/net/cadence_gem.h" #include "hw/qdev-properties.h" #include "hw/registerfields.h" diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c index be16769de29..52584c5d6fa 100644 --- a/hw/net/can/can_kvaser_pci.c +++ b/hw/net/can/can_kvaser_pci.c @@ -32,7 +32,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c index 44f3ba370dc..2e9e09741b2 100644 --- a/hw/net/can/can_mioe3680_pci.c +++ b/hw/net/can/can_mioe3680_pci.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c index 7296d63be79..7dd23c905e5 100644 --- a/hw/net/can/can_pcm3680_pci.c +++ b/hw/net/can/can_pcm3680_pci.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c index 6b08e977a1d..922431effbc 100644 --- a/hw/net/can/can_sja1000.c +++ b/hw/net/can/can_sja1000.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/bitops.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "net/can_emu.h" =20 diff --git a/hw/net/can/ctucan_core.c b/hw/net/can/ctucan_core.c index 6bd99c477b2..b6ad7cdb400 100644 --- a/hw/net/can/ctucan_core.c +++ b/hw/net/can/ctucan_core.c @@ -29,7 +29,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/bitops.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "net/can_emu.h" =20 diff --git a/hw/net/can/ctucan_pci.c b/hw/net/can/ctucan_pci.c index bed6785433e..ad2b1e60cb4 100644 --- a/hw/net/can/ctucan_pci.c +++ b/hw/net/can/ctucan_pci.c @@ -29,7 +29,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 5735639b85a..07342795575 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -32,7 +32,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/register.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c index ca9edd4a5b8..a98b208169f 100644 --- a/hw/net/can/xlnx-zynqmp-can.c +++ b/hw/net/can/xlnx-zynqmp-can.c @@ -32,7 +32,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qapi/error.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index d49032059bb..68062481c59 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/net/dp8393x.h" #include "hw/sysbus.h" diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 846f6cbc5d9..6ae8a1e1a3c 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -28,7 +28,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/net/mii.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index c41ce889cf1..d5590391b7f 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -12,7 +12,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/net/ftgmac100.h" #include "system/dma.h" #include "qapi/error.h" diff --git a/hw/net/i82596.c b/hw/net/i82596.c index af1abd49960..a94cfa2d6df 100644 --- a/hw/net/i82596.c +++ b/hw/net/i82596.c @@ -40,7 +40,7 @@ #include "qemu/timer.h" #include "net/net.h" #include "net/eth.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "system/address-spaces.h" diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index e5e34dd1a47..386d24421cb 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -22,7 +22,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/net/imx_fec.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index 3017e129710..1c9bb4807d2 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -15,7 +15,7 @@ #include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/net/lan9118_phy.h" #include "hw/net/lan9118.h" #include "hw/ptimer.h" diff --git a/hw/net/lan9118_phy.c b/hw/net/lan9118_phy.c index 4c4e03df115..f0f6e55d807 100644 --- a/hw/net/lan9118_phy.c +++ b/hw/net/lan9118_phy.c @@ -15,7 +15,7 @@ #include "qemu/osdep.h" #include "hw/net/lan9118_phy.h" #include "hw/net/mii.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/resettable.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index ae128fa3114..9cd94369859 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "net/net.h" #include "qemu/module.h" #include "hw/m68k/mcf.h" diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c index 59045973ab9..3e279209628 100644 --- a/hw/net/msf2-emac.c +++ b/hw/net/msf2-emac.c @@ -34,7 +34,7 @@ #include "hw/registerfields.h" #include "hw/net/msf2-emac.h" #include "hw/net/mii.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" =20 diff --git a/hw/net/mv88w8618_eth.c b/hw/net/mv88w8618_eth.c index 6f08846c81c..68fda839660 100644 --- a/hw/net/mv88w8618_eth.c +++ b/hw/net/mv88w8618_eth.c @@ -9,7 +9,7 @@ #include "qapi/error.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/net/mv88w8618_eth.h" #include "migration/vmstate.h" #include "system/dma.h" diff --git a/hw/net/ne2000-pci.c b/hw/net/ne2000-pci.c index ce937e1b618..7b215eb1f2e 100644 --- a/hw/net/ne2000-pci.c +++ b/hw/net/ne2000-pci.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index b1923c8c3e1..fea21627f0f 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -26,7 +26,7 @@ #include "net/eth.h" #include "qemu/module.h" #include "system/memory.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "ne2000.h" #include "trace.h" diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c index 9ba35e2c819..9eb39a6b846 100644 --- a/hw/net/npcm7xx_emc.c +++ b/hw/net/npcm7xx_emc.c @@ -31,7 +31,7 @@ =20 #include /* for crc32 */ =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/net/npcm7xx_emc.h" diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index 7e955c01322..85419321d94 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -32,7 +32,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/net/mii.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index 0ca5bc21938..dad5d2ab06d 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -28,7 +28,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index ad675ab29d4..fc2ce5eeb2d 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -37,7 +37,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "net/net.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index 5cd78e334b6..b1c675be6fc 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -11,7 +11,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/net/smc91c111.h" #include "hw/registerfields.h" #include "hw/qdev-properties.h" diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index 2fc51e1e16d..a05aa8a024c 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/net/tulip.c b/hw/net/tulip.c index 319af906c8d..5f9df76a74e 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" #include "hw/nvram/eeprom93xx.h" diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index d45f8724673..25768644f58 100644 --- a/hw/net/xgmac.c +++ b/hw/net/xgmac.c @@ -25,7 +25,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 1f5c7480476..c7cb257e62d 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -31,7 +31,7 @@ #include "net/net.h" #include "net/checksum.h" =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/stream.h" #include "qom/object.h" diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 42b19d07c76..0d00e3cc0d9 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -32,7 +32,7 @@ #include "qom/object.h" #include "qapi/error.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/misc/unimp.h" diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c index 0d4d6c0d875..1abd9489044 100644 --- a/hw/nubus/nubus-device.c +++ b/hw/nubus/nubus-device.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qemu/datadir.h" #include "exec/target_page.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/loader.h" #include "hw/nubus/nubus.h" #include "qapi/error.h" diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index 769107e835e..a42e7b5e271 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -22,7 +22,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "net/net.h" diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c index 3cfd1c0b5ce..bc5d27dbdd8 100644 --- a/hw/openrisc/virt.c +++ b/hw/openrisc/virt.c @@ -12,7 +12,7 @@ #include "qapi/error.h" #include "cpu.h" #include "system/address-spaces.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "hw/core/split-irq.h" diff --git a/hw/pci-host/articia.c b/hw/pci-host/articia.c index cc65aac2a87..1881e03d586 100644 --- a/hw/pci-host/articia.c +++ b/hw/pci-host/articia.c @@ -12,7 +12,7 @@ #include "qapi/error.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/i2c/bitbang_i2c.h" #include "hw/intc/i8259.h" #include "hw/pci-host/articia.h" diff --git a/hw/pci-host/aspeed_pcie.c b/hw/pci-host/aspeed_pcie.c index 1fc2c617727..5d837f638c2 100644 --- a/hw/pci-host/aspeed_pcie.c +++ b/hw/pci-host/aspeed_pcie.c @@ -19,7 +19,7 @@ #include "qapi/error.h" #include "hw/qdev-properties.h" #include "hw/registerfields.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_host.h" #include "hw/pci/pcie_port.h" #include "hw/pci-host/aspeed_pcie.h" diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c index 1024ede7b68..b54f6ef2d53 100644 --- a/hw/pci-host/astro.c +++ b/hw/pci-host/astro.c @@ -25,7 +25,7 @@ #include "qemu/module.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_bus.h" #include "hw/qdev-properties.h" diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index cbda068ef7d..90040045c1f 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -43,7 +43,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/pci/pci_device.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/mips/mips.h" #include "hw/pci-host/bonito.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index f6e49ce9b8d..5a80502abb7 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -28,7 +28,7 @@ #include "hw/pci/pcie_port.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci-host/designware.h" =20 #define DESIGNWARE_PCIE_PORT_LINK_CONTROL 0x710 diff --git a/hw/pci-host/dino.c b/hw/pci-host/dino.c index 924053499c1..e6fdb927f5e 100644 --- a/hw/pci-host/dino.c +++ b/hw/pci-host/dino.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_bus.h" #include "hw/qdev-properties.h" diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index b806a2286f7..3db4c8c9f05 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -31,7 +31,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_bus.h" #include "hw/pci-host/gpex.h" #include "hw/qdev-properties.h" diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c index f9da5a908c1..85a4b83228a 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/qdev-properties.h" #include "hw/pci/pci_device.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qapi/error.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/pci-host/gt64120.c b/hw/pci-host/gt64120.c index b1d96f62fe9..3e497b5da5b 100644 --- a/hw/pci-host/gt64120.c +++ b/hw/pci-host/gt64120.c @@ -36,7 +36,7 @@ #include "hw/misc/empty_slot.h" #include "migration/vmstate.h" #include "hw/intc/i8259.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "trace.h" #include "qom/object.h" =20 diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c index e05b6770102..9f080e4825a 100644 --- a/hw/pci-host/mv64361.c +++ b/hw/pci-host/mv64361.c @@ -14,7 +14,7 @@ #include "hw/sysbus.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/intc/i8259.h" #include "hw/qdev-properties.h" #include "system/address-spaces.h" diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c index 5d8383fac30..9808d575509 100644 --- a/hw/pci-host/pnv_phb3.c +++ b/hw/pci-host/pnv_phb3.c @@ -18,7 +18,7 @@ #include "hw/pci/pcie_port.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "qom/object.h" #include "system/system.h" diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c index 3a83311faff..f6bf4e323a9 100644 --- a/hw/pci-host/pnv_phb3_msi.c +++ b/hw/pci-host/pnv_phb3_msi.c @@ -13,7 +13,7 @@ #include "hw/pci-host/pnv_phb3.h" #include "hw/ppc/pnv.h" #include "hw/pci/msi.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "system/reset.h" =20 diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c index 18992054e83..9f17fc1bb41 100644 --- a/hw/pci-host/pnv_phb4.c +++ b/hw/pci-host/pnv_phb4.c @@ -18,7 +18,7 @@ #include "hw/pci/pcie_port.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "qom/object.h" #include "trace.h" diff --git a/hw/pci-host/ppc440_pcix.c b/hw/pci-host/ppc440_pcix.c index 744b85e49cc..3bd15b8c32b 100644 --- a/hw/pci-host/ppc440_pcix.c +++ b/hw/pci-host/ppc440_pcix.c @@ -24,7 +24,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qemu/units.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci-host/ppc4xx.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/ppc4xx_pci.c b/hw/pci-host/ppc4xx_pci.c index 25478176881..b9a00f51930 100644 --- a/hw/pci-host/ppc4xx_pci.c +++ b/hw/pci-host/ppc4xx_pci.c @@ -23,7 +23,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci-host/ppc4xx.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index 975d191ccb8..a8e172136eb 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -15,7 +15,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/pci/pci_device.h" diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index 22ad244eb6e..3032e0d6854 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -32,7 +32,7 @@ #include "hw/pci/pci_host.h" #include "hw/qdev-properties.h" #include "hw/intc/i8259.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/or-irq.h" #include "qom/object.h" =20 diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c index 538624c5079..c2f99b76f80 100644 --- a/hw/pci-host/sabre.c +++ b/hw/pci-host/sabre.c @@ -31,7 +31,7 @@ #include "hw/qdev-properties.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci-bridge/simba.h" #include "hw/pci-host/sabre.h" #include "qapi/error.h" diff --git a/hw/pci-host/sh_pci.c b/hw/pci-host/sh_pci.c index 62fb945075f..87a71c889e4 100644 --- a/hw/pci-host/sh_pci.c +++ b/hw/pci-host/sh_pci.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/sh4/sh.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" #include "qemu/module.h" diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index 194037d6e75..7a25f3f39f5 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "qemu/module.h" #include "hw/pci/pci_device.h" diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 8ea26e3ff00..40dce72e674 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -11,7 +11,7 @@ #include "qemu/units.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index c71492de9e7..ac6e61c83b0 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -23,7 +23,7 @@ #include "qapi/error.h" #include "hw/pci/pci_bridge.h" #include "hw/qdev-properties.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci-host/xilinx-pcie.h" =20 enum root_cfg_reg { diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 02a59f355b6..ffeb3fbf7cf 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/datadir.h" #include "qemu/units.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 8842f7f6b88..eeca31dabb9 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -49,7 +49,7 @@ #include "hw/platform-bus.h" #include "hw/net/fsl_etsec/etsec.h" #include "hw/i2c/i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sd/sdhci.h" #include "hw/misc/unimp.h" =20 diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c index e7396a729f3..8b5958e7498 100644 --- a/hw/ppc/pegasos.c +++ b/hw/ppc/pegasos.c @@ -13,7 +13,7 @@ #include "hw/ppc/ppc.h" #include "hw/sysbus.h" #include "hw/pci/pci_host.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/or-irq.h" #include "hw/pci-host/articia.h" #include "hw/pci-host/mv64361.h" diff --git a/hw/ppc/pnv_chiptod.c b/hw/ppc/pnv_chiptod.c index f887a18cde8..540d5e365f4 100644 --- a/hw/ppc/pnv_chiptod.c +++ b/hw/ppc/pnv_chiptod.c @@ -28,7 +28,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/ppc/fdt.h" #include "hw/ppc/ppc.h" diff --git a/hw/ppc/pnv_i2c.c b/hw/ppc/pnv_i2c.c index 60de4794917..213e58b455c 100644 --- a/hw/ppc/pnv_i2c.c +++ b/hw/ppc/pnv_i2c.c @@ -11,7 +11,7 @@ #include "qemu/log.h" #include "system/reset.h" =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" =20 #include "hw/ppc/pnv.h" diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c index f6beba0917d..538681bdb32 100644 --- a/hw/ppc/pnv_lpc.c +++ b/hw/ppc/pnv_lpc.c @@ -22,7 +22,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "hw/ppc/pnv.h" diff --git a/hw/ppc/pnv_occ.c b/hw/ppc/pnv_occ.c index 24b789c191c..7e93e6a6b11 100644 --- a/hw/ppc/pnv_occ.c +++ b/hw/ppc/pnv_occ.c @@ -21,7 +21,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index 5d947d8b520..1cea9375c0e 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "system/address-spaces.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "target/ppc/cpu.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/ppc/pnv_sbe.c b/hw/ppc/pnv_sbe.c index 34dc013d47b..4798e129983 100644 --- a/hw/ppc/pnv_sbe.c +++ b/hw/ppc/pnv_sbe.c @@ -21,7 +21,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 3e436c70413..a512d4fa647 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc_e500.h" #include "qemu/timer.h" diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index 89e3fae08d7..fd9203d7e2a 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -12,7 +12,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ppc/ppc4xx.h" #include "hw/pci-host/ppc4xx.h" #include "hw/qdev-properties.h" diff --git a/hw/ppc/ppc4xx_sdram.c b/hw/ppc/ppc4xx_sdram.c index 592769826bd..6cc2a82ac5c 100644 --- a/hw/ppc/ppc4xx_sdram.c +++ b/hw/ppc/ppc4xx_sdram.c @@ -35,7 +35,7 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "system/address-spaces.h" /* get_system_memory() */ -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/ppc/ppc4xx.h" #include "trace.h" diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c index 41cd923b94a..d0e42e8731a 100644 --- a/hw/ppc/prep_systemio.c +++ b/hw/ppc/prep_systemio.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 892ddc7f8f7..b1774e88f2b 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -34,7 +34,7 @@ #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" #include "hw/pci/pci.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci-host/spapr.h" #include "hw/ppc/spapr_drc.h" #include "qemu/help_option.h" diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index fc45a5d5d61..32a2edbe5cc 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -11,7 +11,7 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_cpu_core.h" #include "hw/ppc/spapr_xive.h" diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index d596a9e38e3..523edaa7b6c 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/pci.h" diff --git a/hw/riscv/riscv-iommu-sys.c b/hw/riscv/riscv-iommu-sys.c index e34d00aef64..7d8c6f1c7c6 100644 --- a/hw/riscv/riscv-iommu-sys.c +++ b/hw/riscv/riscv-iommu-sys.c @@ -17,7 +17,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_bus.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 6839a2635e8..00438d2e596 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -40,7 +40,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/core/boards.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/loader.h" #include "hw/sysbus.h" #include "hw/cpu/cluster.h" diff --git a/hw/rtc/exynos4210_rtc.c b/hw/rtc/exynos4210_rtc.c index 624b4f61a85..a7e17031ca8 100644 --- a/hw/rtc/exynos4210_rtc.c +++ b/hw/rtc/exynos4210_rtc.c @@ -34,7 +34,7 @@ #include "qemu/bcd.h" #include "hw/ptimer.h" =20 -#include "hw/irq.h" +#include "hw/core/irq.h" =20 #include "hw/arm/exynos4210.h" #include "qom/object.h" diff --git a/hw/rtc/goldfish_rtc.c b/hw/rtc/goldfish_rtc.c index 78df031cf29..67f9eacb22a 100644 --- a/hw/rtc/goldfish_rtc.c +++ b/hw/rtc/goldfish_rtc.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "hw/rtc/goldfish_rtc.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/bitops.h" diff --git a/hw/rtc/ls7a_rtc.c b/hw/rtc/ls7a_rtc.c index 10097b2db75..234a7e97698 100644 --- a/hw/rtc/ls7a_rtc.c +++ b/hw/rtc/ls7a_rtc.c @@ -7,7 +7,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/register.h" #include "qemu/timer.h" #include "system/system.h" diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c index 68be2dad6f3..0be17b3e798 100644 --- a/hw/rtc/m48t59.c +++ b/hw/rtc/m48t59.c @@ -24,7 +24,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/rtc/m48t59.h" #include "qemu/timer.h" diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index 8631386b9f0..4c4c1c84219 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -28,7 +28,7 @@ #include "qemu/bcd.h" #include "hw/acpi/acpi_aml_interface.h" #include "hw/intc/kvm_irqcount.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/timer.h" diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c index e545b9dfd64..2ec8ac8add6 100644 --- a/hw/rtc/pl031.c +++ b/hw/rtc/pl031.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "hw/rtc/pl031.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/timer.h" diff --git a/hw/rtc/xlnx-zynqmp-rtc.c b/hw/rtc/xlnx-zynqmp-rtc.c index 500982a8011..18849340d62 100644 --- a/hw/rtc/xlnx-zynqmp-rtc.c +++ b/hw/rtc/xlnx-zynqmp-rtc.c @@ -30,7 +30,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/cutils.h" #include "system/system.h" #include "system/rtc.h" diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 12c86eb7aaa..b31ccdbeccb 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci_device.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/nvram/eeprom93xx.h" #include "hw/scsi/esp.h" #include "migration/vmstate.h" diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 2809fcdee09..9da6119be26 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/scsi/esp.h" #include "trace.h" #include "qemu/log.h" diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 9ea4aa0a853..6f43e500b3c 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -15,7 +15,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/scsi/scsi.h" #include "migration/vmstate.h" diff --git a/hw/scsi/ncr53c710.c b/hw/scsi/ncr53c710.c index 47a69834912..9931fd4dc7d 100644 --- a/hw/scsi/ncr53c710.c +++ b/hw/scsi/ncr53c710.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/timer.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/scsi/scsi.h" #include "hw/scsi/ncr53c710.h" diff --git a/hw/sd/allwinner-sdhost.c b/hw/sd/allwinner-sdhost.c index 9d61b372e70..4c039b9520e 100644 --- a/hw/sd/allwinner-sdhost.c +++ b/hw/sd/allwinner-sdhost.c @@ -25,7 +25,7 @@ #include "system/blockdev.h" #include "system/dma.h" #include "hw/qdev-properties.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sd/allwinner-sdhost.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/sd/aspeed_sdhci.c b/hw/sd/aspeed_sdhci.c index fc38ad39ce1..c2c85eaaf17 100644 --- a/hw/sd/aspeed_sdhci.c +++ b/hw/sd/aspeed_sdhci.c @@ -11,7 +11,7 @@ #include "qemu/error-report.h" #include "hw/sd/aspeed_sdhci.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/qdev-properties.h" #include "trace.h" diff --git a/hw/sd/bcm2835_sdhost.c b/hw/sd/bcm2835_sdhost.c index f7cef7bb1cd..2736aa14d43 100644 --- a/hw/sd/bcm2835_sdhost.c +++ b/hw/sd/bcm2835_sdhost.c @@ -15,7 +15,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "system/blockdev.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sd/bcm2835_sdhost.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index 5a1d25defaa..267b723e3c5 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/arm/omap.h" #include "hw/sd/sd.h" diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 5d56ead4d91..761b262d7ba 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -11,7 +11,7 @@ #include "system/blockdev.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sd/sd.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 40a75a43ffb..ff45c8e70ca 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -35,7 +35,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/cutils.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/registerfields.h" #include "system/block-backend.h" #include "hw/sd/sd.h" diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c index c18b91fe63c..0e38bed49a9 100644 --- a/hw/sd/sdhci-pci.c +++ b/hw/sd/sdhci-pci.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 89b595ce4a5..39185f0a987 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -28,7 +28,7 @@ #include "qemu/units.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "system/dma.h" #include "qemu/timer.h" diff --git a/hw/sensor/adm1266.c b/hw/sensor/adm1266.c index 9017ce6116c..37d1cffd57a 100644 --- a/hw/sensor/adm1266.c +++ b/hw/sensor/adm1266.c @@ -11,7 +11,7 @@ =20 #include "qemu/osdep.h" #include "hw/i2c/pmbus_device.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/sensor/adm1272.c b/hw/sensor/adm1272.c index 0c739aa0d85..0aa2a865568 100644 --- a/hw/sensor/adm1272.c +++ b/hw/sensor/adm1272.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "hw/i2c/pmbus_device.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/sensor/max31785.c b/hw/sensor/max31785.c index c75581455a2..468858a60e4 100644 --- a/hw/sensor/max31785.c +++ b/hw/sensor/max31785.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "hw/i2c/pmbus_device.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/sensor/max34451.c b/hw/sensor/max34451.c index a369d2b5319..4d64434f3af 100644 --- a/hw/sensor/max34451.c +++ b/hw/sensor/max34451.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "hw/i2c/pmbus_device.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/sensor/tmp105.c b/hw/sensor/tmp105.c index f5b61109e36..4e5c968bcc7 100644 --- a/hw/sensor/tmp105.c +++ b/hw/sensor/tmp105.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "hw/i2c/i2c.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/sensor/tmp105.h" #include "qapi/error.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index bccd40f5712..5352f23ae82 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -39,7 +39,7 @@ #include "net/net.h" #include "sh7750_regs.h" #include "hw/ide/mmio.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/loader.h" #include "hw/usb/usb.h" #include "hw/block/flash.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 300eabc595d..6cb42e34412 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sh4/sh.h" #include "system/system.h" #include "target/sh4/cpu.h" diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 367beecf192..500b63bc9b7 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -30,7 +30,7 @@ #include "qapi/error.h" #include "qemu/datadir.h" #include "cpu.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/timer.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index b0d2d6f8bc8..fa5592f26cb 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -49,7 +49,7 @@ #include "hw/char/escc.h" #include "hw/misc/empty_slot.h" #include "hw/misc/unimp.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/or-irq.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c index a7ff36ee78c..9ce2e3b7fc8 100644 --- a/hw/sparc/sun4m_iommu.c +++ b/hw/sparc/sun4m_iommu.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 62ceb7eef4d..5b25ba81cc8 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -29,7 +29,7 @@ #include "qemu/datadir.h" #include "cpu.h" #include "exec/target_page.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" diff --git a/hw/ssi/allwinner-a10-spi.c b/hw/ssi/allwinner-a10-spi.c index 6b7cca8d32a..69920b935af 100644 --- a/hw/ssi/allwinner-a10-spi.c +++ b/hw/ssi/allwinner-a10-spi.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ssi/allwinner-a10-spi.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index e33496f5029..9819904a4ad 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -33,7 +33,7 @@ #include "qemu/units.h" #include "trace.h" =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/ssi/aspeed_smc.h" =20 diff --git a/hw/ssi/bcm2835_spi.c b/hw/ssi/bcm2835_spi.c index bf8ba35e04c..01763c458c1 100644 --- a/hw/ssi/bcm2835_spi.c +++ b/hw/ssi/bcm2835_spi.c @@ -26,7 +26,7 @@ #include "qemu/log.h" #include "qemu/fifo8.h" #include "hw/ssi/bcm2835_spi.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "migration/vmstate.h" =20 static void bcm2835_spi_update_int(BCM2835SPIState *s) diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c index f05be687483..63f4cce5129 100644 --- a/hw/ssi/ibex_spi_host.c +++ b/hw/ssi/ibex_spi_host.c @@ -28,7 +28,7 @@ #include "qemu/module.h" #include "hw/registerfields.h" #include "hw/ssi/ibex_spi_host.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" diff --git a/hw/ssi/imx_spi.c b/hw/ssi/imx_spi.c index 1312f588d2e..8e014b7a7bb 100644 --- a/hw/ssi/imx_spi.c +++ b/hw/ssi/imx_spi.c @@ -9,7 +9,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ssi/imx_spi.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/ssi/mss-spi.c b/hw/ssi/mss-spi.c index fd7ba7eeb04..3c118fc0f8c 100644 --- a/hw/ssi/mss-spi.c +++ b/hw/ssi/mss-spi.c @@ -24,7 +24,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ssi/mss-spi.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/ssi/npcm7xx_fiu.c b/hw/ssi/npcm7xx_fiu.c index 056ce13394f..bc5e4e20ccd 100644 --- a/hw/ssi/npcm7xx_fiu.c +++ b/hw/ssi/npcm7xx_fiu.c @@ -16,7 +16,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/ssi/npcm7xx_fiu.h" #include "migration/vmstate.h" diff --git a/hw/ssi/npcm_pspi.c b/hw/ssi/npcm_pspi.c index a31dcc050e8..1f11e1f8a46 100644 --- a/hw/ssi/npcm_pspi.c +++ b/hw/ssi/npcm_pspi.c @@ -16,7 +16,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/registerfields.h" #include "hw/ssi/npcm_pspi.h" #include "migration/vmstate.h" diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c index 1dc0bcbcc04..1851118d55f 100644 --- a/hw/ssi/pl022.c +++ b/hw/ssi/pl022.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ssi/pl022.h" #include "hw/ssi/ssi.h" #include "qemu/log.h" diff --git a/hw/ssi/pnv_spi.c b/hw/ssi/pnv_spi.c index f40e8836b9c..e59386712b4 100644 --- a/hw/ssi/pnv_spi.c +++ b/hw/ssi/pnv_spi.c @@ -14,7 +14,7 @@ #include "hw/ssi/pnv_spi_regs.h" #include "hw/ssi/ssi.h" #include -#include "hw/irq.h" +#include "hw/core/irq.h" #include "trace.h" =20 #define PNV_SPI_OPCODE_LO_NIBBLE(x) (x & 0x0F) diff --git a/hw/ssi/sifive_spi.c b/hw/ssi/sifive_spi.c index 3e01fef61cd..c66fae80a9c 100644 --- a/hw/ssi/sifive_spi.c +++ b/hw/ssi/sifive_spi.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "hw/ssi/ssi.h" diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 4144c8a6270..9e8656b5560 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -31,7 +31,7 @@ #include "qemu/module.h" #include "qemu/fifo8.h" =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/ssi/ssi.h" diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index a79f3b8e494..b2f66275182 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" #include "qemu/log.h" diff --git a/hw/ssi/xlnx-versal-ospi.c b/hw/ssi/xlnx-versal-ospi.c index 56d51ce0e30..88fafb5a2ed 100644 --- a/hw/ssi/xlnx-versal-ospi.c +++ b/hw/ssi/xlnx-versal-ospi.c @@ -28,7 +28,7 @@ #include "hw/qdev-properties.h" #include "qemu/bitops.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ssi/xlnx-versal-ospi.h" =20 #ifndef XILINX_VERSAL_OSPI_ERR_DEBUG diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index 690140f5a6c..a0b73fb7311 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -22,7 +22,7 @@ =20 #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/timer/a9gtimer.h" #include "migration/vmstate.h" diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index e4c353273a1..6c0d3b556a2 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -16,7 +16,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "hw/timer/allwinner-a10-pit.h" diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index 7cc5915e9ec..ac6313039a8 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -21,7 +21,7 @@ =20 #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" #include "hw/timer/arm_mptimer.h" diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 56638ff5cdc..e5ef28de6f7 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -11,7 +11,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" #include "qemu/module.h" diff --git a/hw/timer/armv7m_systick.c b/hw/timer/armv7m_systick.c index 7e4ddcd4058..c9e0f4c2e17 100644 --- a/hw/timer/armv7m_systick.c +++ b/hw/timer/armv7m_systick.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "hw/timer/armv7m_systick.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/qdev-clock.h" #include "qemu/timer.h" diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index 57db03512f4..b08a737bc97 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -11,7 +11,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/timer/aspeed_timer.h" #include "migration/vmstate.h" diff --git a/hw/timer/avr_timer16.c b/hw/timer/avr_timer16.c index 012d8290018..0f1fda4218f 100644 --- a/hw/timer/avr_timer16.c +++ b/hw/timer/avr_timer16.c @@ -34,7 +34,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/timer/avr_timer16.h" #include "trace.h" diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c index 9c7ba168768..6f02c6a02d9 100644 --- a/hw/timer/cadence_ttc.c +++ b/hw/timer/cadence_ttc.c @@ -17,7 +17,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c index 34c550a3f98..57fea11a855 100644 --- a/hw/timer/cmsdk-apb-dualtimer.c +++ b/hw/timer/cmsdk-apb-dualtimer.c @@ -22,7 +22,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/registerfields.h" #include "hw/qdev-clock.h" diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c index 4095267b4aa..8b7595731cc 100644 --- a/hw/timer/cmsdk-apb-timer.c +++ b/hw/timer/cmsdk-apb-timer.c @@ -33,7 +33,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/registerfields.h" #include "hw/qdev-clock.h" #include "hw/timer/cmsdk-apb-timer.h" diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index bb0f9c8b9a6..06524efca27 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -61,7 +61,7 @@ #include "hw/ptimer.h" =20 #include "hw/arm/exynos4210.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qom/object.h" =20 //#define DEBUG_MCT diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c index 69f737a8e6f..dc76932fdfb 100644 --- a/hw/timer/exynos4210_pwm.c +++ b/hw/timer/exynos4210_pwm.c @@ -29,7 +29,7 @@ #include "hw/ptimer.h" =20 #include "hw/arm/exynos4210.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qom/object.h" =20 //#define DEBUG_PWM diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 0e06fa09e99..6218c255d2c 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -28,7 +28,7 @@ #include "hw/timer/grlib_gptimer.h" #include "hw/sysbus.h" #include "qemu/timer.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" #include "qemu/module.h" diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 1acba4fa9db..1387c417ae1 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -25,7 +25,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index 7033ebf50da..1a8b6bf9abe 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/module.h" #include "qemu/timer.h" #include "hw/timer/i8254.h" diff --git a/hw/timer/ibex_timer.c b/hw/timer/ibex_timer.c index c7320ef30fa..d2c4f86e038 100644 --- a/hw/timer/ibex_timer.c +++ b/hw/timer/ibex_timer.c @@ -29,7 +29,7 @@ #include "qemu/log.h" #include "qemu/timer.h" #include "hw/timer/ibex_timer.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "target/riscv/cpu.h" #include "migration/vmstate.h" diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c index 6123321c352..c67a39f10cc 100644 --- a/hw/timer/imx_epit.c +++ b/hw/timer/imx_epit.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" #include "hw/timer/imx_epit.h" #include "migration/vmstate.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/misc/imx_ccm.h" #include "qemu/module.h" #include "qemu/log.h" diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c index 8c7cbfdeac3..168cadcb3f9 100644 --- a/hw/timer/imx_gpt.c +++ b/hw/timer/imx_gpt.c @@ -13,7 +13,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/timer/imx_gpt.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c index 2ce821178b6..946e87c99a6 100644 --- a/hw/timer/mss-timer.c +++ b/hw/timer/mss-timer.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/timer/mss-timer.h" #include "migration/vmstate.h" diff --git a/hw/timer/npcm7xx_timer.c b/hw/timer/npcm7xx_timer.c index 6a116ad54b7..e09e4ee03ad 100644 --- a/hw/timer/npcm7xx_timer.c +++ b/hw/timer/npcm7xx_timer.c @@ -16,7 +16,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/timer/npcm7xx_timer.h" diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c index e228fdebc34..0688f49eefb 100644 --- a/hw/timer/nrf51_timer.c +++ b/hw/timer/nrf51_timer.c @@ -15,7 +15,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/arm/nrf51.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/timer/nrf51_timer.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index 6d4ac31574e..d18d98b2337 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "qemu/timer.h" #include "system/runstate.h" diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c index cdff7f47f16..c62dad690ff 100644 --- a/hw/timer/renesas_cmt.c +++ b/hw/timer/renesas_cmt.c @@ -23,7 +23,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/registerfields.h" #include "hw/qdev-properties.h" #include "hw/timer/renesas_cmt.h" diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c index 95707f2b8c5..1fc539e9497 100644 --- a/hw/timer/renesas_tmr.c +++ b/hw/timer/renesas_tmr.c @@ -23,7 +23,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/registerfields.h" #include "hw/qdev-properties.h" #include "hw/timer/renesas_tmr.h" diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c index d4fa32c9d65..adc05715528 100644 --- a/hw/timer/sh_timer.c +++ b/hw/timer/sh_timer.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "system/memory.h" #include "qemu/log.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sh4/sh.h" #include "hw/timer/tmu012.h" #include "hw/ptimer.h" diff --git a/hw/timer/sifive_pwm.c b/hw/timer/sifive_pwm.c index e85e389f7a5..f1882ae6bc1 100644 --- a/hw/timer/sifive_pwm.c +++ b/hw/timer/sifive_pwm.c @@ -26,7 +26,7 @@ =20 #include "qemu/osdep.h" #include "trace.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/timer/sifive_pwm.h" #include "hw/qdev-properties.h" #include "hw/registerfields.h" diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 3e071fbdb4c..5bf94157ca4 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "qemu/timer.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c index c5fd038162b..fc48179d25d 100644 --- a/hw/timer/sse-timer.c +++ b/hw/timer/sse-timer.c @@ -41,7 +41,7 @@ #include "hw/timer/sse-timer.h" #include "hw/timer/sse-counter.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/registerfields.h" #include "hw/core/clock.h" #include "hw/qdev-clock.h" diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index be844e7f5a3..979b6ad5bae 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/timer/stm32f2xx_timer.h" #include "migration/vmstate.h" diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index ff4a224d08f..c1b6d2bdf2d 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c index cdd0df11374..1615be29339 100644 --- a/hw/tpm/tpm_tis_common.c +++ b/hw/tpm/tpm_tis_common.c @@ -23,7 +23,7 @@ * TPM Profile (PTP) Specification, Family 2.0, Revision 00.43 */ #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/isa.h" #include "qapi/error.h" #include "qemu/bswap.h" diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c index 0577747f469..cab42ae7b65 100644 --- a/hw/ufs/ufs.c +++ b/hw/ufs/ufs.c @@ -25,7 +25,7 @@ #include "qapi/error.h" #include "migration/vmstate.h" #include "scsi/constants.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "trace.h" #include "ufs.h" =20 diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index b090f253656..57f930b0998 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -28,7 +28,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/usb/ehci-regs.h" #include "hw/usb/hcd-ehci.h" #include "migration/vmstate.h" diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c index 2d3c770b117..5c3434153db 100644 --- a/hw/usb/hcd-ohci-sysbus.c +++ b/hw/usb/hcd-ohci-sysbus.c @@ -19,7 +19,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index c48f07f7e39..ea3d5d2bd14 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -26,7 +26,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 124ac4faec0..c243a4f42cc 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -31,7 +31,7 @@ #include "hw/usb/uhci-regs.h" #include "migration/vmstate.h" #include "hw/pci/pci.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/usb/hcd-xhci-sysbus.c b/hw/usb/hcd-xhci-sysbus.c index 244698e5f2b..862673054a0 100644 --- a/hw/usb/hcd-xhci-sysbus.c +++ b/hw/usb/hcd-xhci-sysbus.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "hcd-xhci-sysbus.h" #include "hw/acpi/aml-build.h" -#include "hw/irq.h" +#include "hw/core/irq.h" =20 static bool xhci_sysbus_intr_raise(XHCIState *xhci, int n, bool level) { diff --git a/hw/usb/vt82c686-uhci-pci.c b/hw/usb/vt82c686-uhci-pci.c index 61628061722..97c09a51cfc 100644 --- a/hw/usb/vt82c686-uhci-pci.c +++ b/hw/usb/vt82c686-uhci-pci.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/isa/vt82c686.h" #include "hcd-uhci.h" =20 diff --git a/hw/usb/xlnx-versal-usb2-ctrl-regs.c b/hw/usb/xlnx-versal-usb2-= ctrl-regs.c index 4114672d4f4..eb946b5dbd9 100644 --- a/hw/usb/xlnx-versal-usb2-ctrl-regs.c +++ b/hw/usb/xlnx-versal-usb2-ctrl-regs.c @@ -29,7 +29,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/register.h" #include "qemu/bitops.h" #include "qom/object.h" diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index c05c00bcd4a..d54d70b4fb8 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -21,7 +21,7 @@ =20 #include "qemu/osdep.h" #include "standard-headers/linux/virtio_mmio.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "hw/virtio/virtio.h" diff --git a/hw/vmapple/aes.c b/hw/vmapple/aes.c index a4853a98f8c..a6e94610b85 100644 --- a/hw/vmapple/aes.c +++ b/hw/vmapple/aes.c @@ -14,7 +14,7 @@ #include "crypto/hash.h" #include "crypto/aes.h" #include "crypto/cipher.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/vmapple/vmapple.h" #include "migration/vmstate.h" diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index 5da28cf72b2..9154a4c2576 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -26,7 +26,7 @@ #include "qemu/units.h" #include "monitor/qdev.h" #include "hw/core/boards.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/loader.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watch= dog.c index 6a8d07ca569..e1a2a33d73e 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -27,7 +27,7 @@ #include "qemu/module.h" #include "system/watchdog.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/registerfields.h" #include "hw/qdev-clock.h" diff --git a/hw/xen/xen-pvh-common.c b/hw/xen/xen-pvh-common.c index c3fc501fe6e..f365222019a 100644 --- a/hw/xen/xen-pvh-common.c +++ b/hw/xen/xen-pvh-common.c @@ -11,7 +11,7 @@ #include "qemu/units.h" #include "qapi/visitor.h" #include "hw/core/boards.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "system/tpm.h" #include "system/tpm_backend.h" #include "system/runstate.h" diff --git a/hw/xtensa/mx_pic.c b/hw/xtensa/mx_pic.c index 8211c993eb7..07c3731aef0 100644 --- a/hw/xtensa/mx_pic.c +++ b/hw/xtensa/mx_pic.c @@ -26,7 +26,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/xtensa/mx_pic.h" #include "qemu/log.h" =20 diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c index e3885316106..c00167859a2 100644 --- a/hw/xtensa/pic_cpu.c +++ b/hw/xtensa/pic_cpu.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/cpu-interrupt.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/log.h" #include "qemu/timer.h" #include "qemu/atomic.h" diff --git a/system/qtest.c b/system/qtest.c index cbeb7f37728..6cf686a31ec 100644 --- a/system/qtest.c +++ b/system/qtest.c @@ -20,7 +20,7 @@ #include "system/memory.h" #include "exec/tswap.h" #include "hw/qdev-core.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/core/cpu.h" #include "qemu/accel.h" #include "system/cpu-timers.h" diff --git a/target/arm/cpregs-gcs.c b/target/arm/cpregs-gcs.c index 1ed52a211a6..e31827342d9 100644 --- a/target/arm/cpregs-gcs.c +++ b/target/arm/cpregs-gcs.c @@ -6,7 +6,7 @@ #include "qemu/osdep.h" #include "qemu/timer.h" #include "exec/icount.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "cpu.h" #include "cpu-features.h" #include "cpregs.h" diff --git a/target/arm/cpregs-pmu.c b/target/arm/cpregs-pmu.c index 31c01eddc87..47e1e4652b1 100644 --- a/target/arm/cpregs-pmu.c +++ b/target/arm/cpregs-pmu.c @@ -6,7 +6,7 @@ #include "qemu/osdep.h" #include "qemu/timer.h" #include "exec/icount.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "cpu.h" #include "cpu-features.h" #include "cpregs.h" diff --git a/target/arm/helper.c b/target/arm/helper.c index 27ebc6f29b8..263ca29d92b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -20,7 +20,7 @@ #include "qemu/qemu-print.h" #include "exec/cputlb.h" #include "exec/translation-block.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "system/cpu-timers.h" #include "exec/icount.h" #include "system/kvm.h" diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 93806fa8005..2b544eaf04d 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -26,7 +26,7 @@ #include "system/address-spaces.h" #include "system/memory.h" #include "hw/core/boards.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/main-loop.h" #include "system/cpus.h" #include "arm-powerctl.h" diff --git a/target/arm/kvm.c b/target/arm/kvm.c index c7ea6fc2f62..12a63602b11 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -34,7 +34,7 @@ #include "system/address-spaces.h" #include "gdbstub/enums.h" #include "hw/core/boards.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qapi/visitor.h" #include "qemu/log.h" #include "hw/acpi/acpi.h" diff --git a/target/i386/tcg/system/fpu_helper.c b/target/i386/tcg/system/f= pu_helper.c index 0b4fa187dfb..26b24d40356 100644 --- a/target/i386/tcg/system/fpu_helper.c +++ b/target/i386/tcg/system/fpu_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "cpu.h" -#include "hw/irq.h" +#include "hw/core/irq.h" =20 static qemu_irq ferr_irq; =20 diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c index 6412584e1bd..8ed62acf84d 100644 --- a/target/loongarch/kvm/kvm.c +++ b/target/loongarch/kvm/kvm.c @@ -20,7 +20,7 @@ #include "exec/memattrs.h" #include "system/address-spaces.h" #include "hw/core/boards.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/loongarch/virt.h" #include "qemu/log.h" #include "hw/loader.h" diff --git a/target/loongarch/tcg/csr_helper.c b/target/loongarch/tcg/csr_h= elper.c index c1a8ba3089c..cd35ca93c7a 100644 --- a/target/loongarch/tcg/csr_helper.c +++ b/target/loongarch/tcg/csr_helper.c @@ -14,7 +14,7 @@ #include "exec/helper-proto.h" #include "exec/cputlb.h" #include "accel/tcg/cpu-ldst.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "cpu-csr.h" #include "cpu-mmu.h" =20 diff --git a/target/mips/system/cp0_timer.c b/target/mips/system/cp0_timer.c index ca16945cee1..afa163c3196 100644 --- a/target/mips/system/cp0_timer.c +++ b/target/mips/system/cp0_timer.c @@ -21,7 +21,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/timer.h" #include "system/kvm.h" #include "internal.h" diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 301d8de67fd..1d99e5f4908 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -38,7 +38,7 @@ #include "system/address-spaces.h" #include "system/memory.h" #include "hw/core/boards.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "hw/intc/riscv_imsic.h" #include "qemu/log.h" #include "hw/loader.h" diff --git a/target/rx/helper.c b/target/rx/helper.c index e9a7aaf610d..9a78f1457f5 100644 --- a/target/rx/helper.c +++ b/target/rx/helper.c @@ -21,7 +21,7 @@ #include "cpu.h" #include "exec/log.h" #include "accel/tcg/cpu-ldst.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "qemu/plugin.h" =20 void rx_cpu_unpack_psw(CPURXState *env, uint32_t psw, int rte) diff --git a/hw/display/apple-gfx-mmio.m b/hw/display/apple-gfx-mmio.m index b0b6e2993eb..b83f5f4fe62 100644 --- a/hw/display/apple-gfx-mmio.m +++ b/hw/display/apple-gfx-mmio.m @@ -16,7 +16,7 @@ #include "qemu/log.h" #include "block/aio-wait.h" #include "hw/sysbus.h" -#include "hw/irq.h" +#include "hw/core/irq.h" #include "apple-gfx.h" #include "trace.h" =20 --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764251812; cv=none; d=zohomail.com; s=zohoarc; b=b445Rnae+kyMZQL+8M0ZISi1kT+jcfaxezPhoWsFecRBzjEerqFJa3gTG2nFvH1YxHL0JuR2SAvJcz8QvGrLswOxHrt5RtD6HrYsJAPia5sXB92wl80FhvJKeXh5bST/yKuTurqto3mhLzsrvpqcLoGasg+cCfMVRmu/MKuNrIw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764251812; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=RfCaKxiAJjTwjj8O2cRflu7YluljfcNTILF8gXRcDSo=; b=Qi1nJQjC5UVYVb79u0YVDW1aGmRnMkyvUhpsKwrWuQVf9qsuOYGU5gMHIeIxXxPhYPou1l/+oJ6hI4iLclTH0Kpu2ifUJWxSN/HHl9ypaG/xzqNE1qFrmRmqH13RIVxxTOGXoYeKrqS9TBvya8y4wYfnd9O8jCPxXJfP91PfuTA= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764251812388282.0358193958241; Thu, 27 Nov 2025 05:56:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObqb-0002cN-1V; Thu, 27 Nov 2025 08:15:45 -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 1vObqY-0002ae-Dk for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:43 -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 1vObqV-0001E4-QQ for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:42 -0500 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-Pt1HpvY6Opi8o0cVONRE9w-1; Thu, 27 Nov 2025 08:15:38 -0500 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-6430b32e97dso797561a12.0 for ; Thu, 27 Nov 2025 05:15:37 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-64751062081sm1507217a12.34.2025.11.27.05.15.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RfCaKxiAJjTwjj8O2cRflu7YluljfcNTILF8gXRcDSo=; b=Ah37P3jlYaBYUymE56Z8ze0i2eSGuMBWboJ0QfWMbnSUgUT1HklObIaRbuzXe0OKM18WeW XxGTdZj/9tDAzERGYZW9dTekT/JKSaQR5ZJ4zkYDlDtaZ/sGey/O81hjiEcR4EjD2oA+J1 jAJE4xY13nggCTnDDhHjwbz9VBlulxo= X-MC-Unique: Pt1HpvY6Opi8o0cVONRE9w-1 X-Mimecast-MFC-AGG-ID: Pt1HpvY6Opi8o0cVONRE9w_1764249337 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249336; x=1764854136; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=RfCaKxiAJjTwjj8O2cRflu7YluljfcNTILF8gXRcDSo=; b=bp5BBe/KQ3Dm08J5acKGLknb2T8fOoeolktEB5YPVMWmr/FQ1hEGN0M1c8Uc6uUPsa RfytuvgwZKCpe6k3KEJlfQXGFD73oji0bPON5rmofm0p7/b+BOmfYwI93zgrtp0gkVVf J3fuOJQc7WmSX8s8gtE+zVWyM40mYcKvsg5Tjgjq4P2phqTKEDoUeELNaPET68OtUU8X fFmt5c5UFv5ezku3yA9UF44xSXq8u4LU6GA83kK7vhvK5eBRRO8DdASe7gN3zhPL4+Uz YatC/LpzXq+E5qScAm5cvhASm0QGnp1nVBcUI12gPnvQIWn1XhWsp9KDIRqdAdrmKn8v OjMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249336; x=1764854136; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=RfCaKxiAJjTwjj8O2cRflu7YluljfcNTILF8gXRcDSo=; b=ZKtlQlRgXT6qYzEKKakiGToRw/668KSo2K34wvLk2iK1pQZaHn56xcWtJNxtWFDWG7 B8MOQy/BtmCoLV3PDtLUc4J4up1PPHtLinN91NaiF7BSKuTaNjWl2FRPfIOv7oQBxFSp MV6xODDb4+c+nTFm9mZ6UyryjbZwFa+u7kPrNodxVtdXny/lBE+Hi3hhzp78hiFIOaNg EwsQaEl4QuDGtxQlOrX7yoTnWs3kHjMcN71OMpl+DScLqZ5+GrC8S3tq2ARQuxNYYoTp ZfZUb8OLKTEoN5ZXhV5kYloKvhiwLlGUt/Zx2nVcRmJepB5b9h73oJHR2crnBBuEaoOF r1fw== X-Gm-Message-State: AOJu0Yz2aVWcUYLyRIB0t6OYqeVv4tXTdE4Gy7WGwc7gAZovxEsWzDQF itYPuksvujxkVNKt7wE/snIDxzFye2g3abEkxc8370lk13vhzj55xO84uMEM7UzAWWSZEiVWhWG vEQ1I9Kf9HVC8HaPOmTSqxt5qr+EIftmjRoTXceICNctaJG4h0HYWdpJvkC6oE+bjjifaHuSqUF Zi93ahlJ7TQRhEj/2YpFFJA7dpHM9pRqNsOmAcVj4i X-Gm-Gg: ASbGnct8N8vGrg5nw15RXdM91g097XMIFw/04RYfq2eccz+BJMExU7xtlmJEdj3xG5s q00hTYiZ9ufyDUUqhWij7PSJULfraUESIg8Dnse+wNa+jL7p2E6VOehw6cx+Vq3J4slreJ8sGPq LBvF3W8GLaMMexxMj1HyOcG0faGi+UbWNr4r6djBp3qHmmfDBgTHAyIb8/171GEF0s+BXL0H/QO 8VhvWiQg9ji9fQOEFIYhSapgF7NxklwT6Y6R4dl0SYJ1r2BQYSTe+mpq8zhZ2Lh72djU/4dew/7 vgBS8GezADRxz3HvKe1G2dW80hrlalkDMNyWdS1P472mMNvCObBqe5G5y1s4GWO1QuDlcAURXeL CbSrTu3KCoA8xdPx5xHAs+J35yVzC8pJaP3jKfgIYvDGcfjkgh/R3lUZeGI8Mt9aNfUFBBRQTNf trZsD1mlY8LULX46k= X-Received: by 2002:a05:6402:2816:b0:640:93b2:fd1e with SMTP id 4fb4d7f45d1cf-64555cd8cc4mr21641194a12.17.1764249336408; Thu, 27 Nov 2025 05:15:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IH319EwxRY3m725ZALLFOJRgIWbRs0XdR3xy5nWkxKLzdg5JPmGmMm/P53ogZn1NVspW4pHoQ== X-Received: by 2002:a05:6402:2816:b0:640:93b2:fd1e with SMTP id 4fb4d7f45d1cf-64555cd8cc4mr21641166a12.17.1764249336019; Thu, 27 Nov 2025 05:15:36 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 10/28] include: move hw/loader-fit.h to hw/core/ Date: Thu, 27 Nov 2025 14:14:57 +0100 Message-ID: <20251127131516.80807-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764251812657019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- include/hw/{ =3D> core}/loader-fit.h | 0 hw/core/loader-fit.c | 2 +- hw/mips/boston.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename include/hw/{ =3D> core}/loader-fit.h (100%) diff --git a/include/hw/loader-fit.h b/include/hw/core/loader-fit.h similarity index 100% rename from include/hw/loader-fit.h rename to include/hw/core/loader-fit.h diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c index 2dea485ae06..59a625ea57d 100644 --- a/hw/core/loader-fit.c +++ b/hw/core/loader-fit.c @@ -22,7 +22,7 @@ #include "qemu/units.h" #include "system/memory.h" #include "hw/loader.h" -#include "hw/loader-fit.h" +#include "hw/core/loader-fit.h" #include "qemu/cutils.h" #include "qemu/error-report.h" #include "system/device_tree.h" diff --git a/hw/mips/boston.c b/hw/mips/boston.c index dc9da0b0401..633b2a90523 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -26,7 +26,7 @@ #include "hw/ide/pci.h" #include "hw/ide/ahci-pci.h" #include "hw/loader.h" -#include "hw/loader-fit.h" +#include "hw/core/loader-fit.h" #include "hw/mips/bootloader.h" #include "hw/mips/cps.h" #include "hw/pci-host/xilinx-pcie.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764252495; cv=none; d=zohomail.com; s=zohoarc; b=JMz0Rlphz6ncauJuTYfBY6LwkUWqy2LamUFHtMKLUT/h4HGcdwc2gNrACvbH4YVm/+U4G+WgzWbb45Vj1Tf0H7QhmUYT96PrDn1HD/jMta//AYCmx4862e3gx+PeGwjFSVZTnnRcAXkaF9yvaI/NL4CroThmbQnLLdoAhMwnfxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764252495; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=ZPYZfIg9aIq3WhaJrg7dI2pXao3E9mhCt8SPaUEuDGk=; b=e71Dg6gImoP03J6z1C9tZCfSfsOY/pDJSyE5JeNevui2NfbYewruGnm2H542Pn6qdHipV7ojIRnPr9svkrOt4yqaYci/zp5nE76CDNW3o/QTfnH7gZ+lH6rxw9qj5TEPq7oyXydu8ZYj3W2bthFWj12nP4LO+UMOiouMWk70Zaw= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764252495106950.5955363245795; Thu, 27 Nov 2025 06:08:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObrl-0003BI-8U; Thu, 27 Nov 2025 08:17:00 -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 1vObqf-0002di-LL for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:49 -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 1vObqb-0001Fa-02 for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:49 -0500 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-624-JM2k2DCSPVasrpsViR42lQ-1; Thu, 27 Nov 2025 08:15:42 -0500 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-b73599315adso73488066b.2 for ; Thu, 27 Nov 2025 05:15:42 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f5162088sm162930366b.1.2025.11.27.05.15.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZPYZfIg9aIq3WhaJrg7dI2pXao3E9mhCt8SPaUEuDGk=; b=YF7MGWBGEpLySD6EeyGOwwde9HqmBqgsCn9Vy0n2klUdYOSsBNuyKS8db2O+MkVbVopZ/4 mucqMAPcIhodEDBv/tXPGjSq6Tz22lVnYBg+1IUHICSHvyUR8WeVB4UyvVyjS3/veK/dYi dLZpUjj41Ri83slEzfLMQRV5JrVzV8Q= X-MC-Unique: JM2k2DCSPVasrpsViR42lQ-1 X-Mimecast-MFC-AGG-ID: JM2k2DCSPVasrpsViR42lQ_1764249341 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249341; x=1764854141; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ZPYZfIg9aIq3WhaJrg7dI2pXao3E9mhCt8SPaUEuDGk=; b=NT1+kgPGUpKAjHF5ds/jWwzVoBUP6jYpe+q9p75LWbzYJrdnZO0B7yrZpmb9KrmS/G +4rMziPEGwNEgU1kZp077974vxMxC4wFYhBNkpJ8fZ64vsa0asU6nc3cPAt998/0xH4z NZ5OrjXIhKISiLvgF+UUxUEek5EPNpeYdbl7RGokKmw7N/+C+HfDK/5QTIE88HMyaTqT sFOyzox+SEZ1zYWMBbRgt2ldt3xsK3EhlzmfS/tO6TMqhCY/tg5/5F61NzwdWz+mYTdy k6p7AVdkBfXD+bvk/hM1uUV9fVrVCZIPFYO2ITj3NY3/9pp5zrPO2y67VV/RS3HS4Nxd +emA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249341; x=1764854141; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ZPYZfIg9aIq3WhaJrg7dI2pXao3E9mhCt8SPaUEuDGk=; b=UixcAZrErIIqbUL3tWwTiG03jRzaLASTCQqsKgBlmF8Qa34KUd/vVPMwAGnOly1gSf JQ9Rtef+1oKMPrafXrR3Ts5Dh3E55m17MgsJdc5nsZjxoubSSdBbhiHMYyqQaltTTbkp zq/JqRYfaAOAmJQpBjLPqaCESnZcSivt0jJM3bdmHHH2MJkvcRFy+aosmt2buq3+bUMX /3+Q58MokwJgusReUNs1XQpu1d9iHGdX0cGCsm8QJ8DXTIBgvUSIi+02ni+8W8ukIhGC Sym1PkWrc2kuwWW3TxXYBiW0IY6xiIwvDxuL7XZ49BP/7c4vJyTrF1xdwt9dJgDnkDhW rbBg== X-Gm-Message-State: AOJu0YwiVHjPmmutuni5Q4yG0FtZBRUcheZp+5y1UhBuqK4hPCtYiV54 m8XwICSJ8ztmgahguRBqjr+JIztGtJlRja+cOv2YzxRLf4/x3OouRhOzbAEfarPgXT20GYPUKSz hHdSESC+CtVy1Oftz3knZLNaJvVYRxQC1c4ZQELH4/GHOdOy+z4ItmgFBdR6rV4Qj7wnO/3TBOL qlfKw5AcU5cb1jJuCZMRo0mW0brcZFjrWFdmMYJarT X-Gm-Gg: ASbGncvdeF3MkbJ5ASZZiv3kQnFQntfGhT+LXWBB5dqmjGYcYmAKtaVm9+E4Fp0wwvJ MSg469f12PJQy2RvYf+HXZT1lV/amN3WOQdit09/t8mnTk1U4btriZZA2R7xa+pUZh1v5QOWora c34OEYkVjSm+872jqt4DxCyAHp65q2912IMiOGOG2QiDFYULheADQYPKM5kzL25FMTFFckL8nsR v5pOHN5XtQLEaQ+oqhjhy25ecBuG+eKDqCAtRG0l3SSr14Vhuhb5Bkv/xzsHRZh7gYIZC1Y9p14 w9kGY+8Gmv49Psx3M+zLrhkFrat88uyYXmVut3v74aK84JFV6vlzTE1q87oETuneXa2x4NTB56O QYLKA7cQ5LSNgIgGKZfHvjt6vJ+EvTYAjTPSn6RsZnSKCyJ7qCM4F7A23tww3hu1vUNR8cOurUZ VDLX6xKLikj0ivcps= X-Received: by 2002:a17:907:7f1b:b0:b4f:e12e:aa24 with SMTP id a640c23a62f3a-b76c53c3547mr1054526566b.22.1764249339364; Thu, 27 Nov 2025 05:15:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IH8qRdozv2I7+EnwvEunzhvlvHUdDxACXhdjRhRv5ZCCivZ2DaBp/2+Am5BhwWaShrKs09pcg== X-Received: by 2002:a17:907:7f1b:b0:b4f:e12e:aa24 with SMTP id a640c23a62f3a-b76c53c3547mr1054512666b.22.1764249337742; Thu, 27 Nov 2025 05:15:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 11/28] include: move hw/loader.h to hw/core/ Date: Thu, 27 Nov 2025 14:14:58 +0100 Message-ID: <20251127131516.80807-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764252496566019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- include/hw/{ =3D> core}/loader.h | 0 include/hw/riscv/boot.h | 2 +- hw/acpi/utils.c | 2 +- hw/alpha/dp264.c | 2 +- hw/arm/allwinner-a10.c | 2 +- hw/arm/allwinner-h3.c | 2 +- hw/arm/allwinner-r40.c | 2 +- hw/arm/armv7m.c | 2 +- hw/arm/aspeed_ast27x0-fc.c | 2 +- hw/arm/aspeed_soc_common.c | 2 +- hw/arm/boot.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4210.c | 2 +- hw/arm/highbank.c | 2 +- hw/arm/npcm7xx.c | 2 +- hw/arm/npcm7xx_boards.c | 2 +- hw/arm/npcm8xx.c | 2 +- hw/arm/npcm8xx_boards.c | 2 +- hw/arm/raspi.c | 2 +- hw/arm/raspi4b.c | 2 +- hw/arm/sbsa-ref.c | 2 +- hw/arm/vexpress.c | 2 +- hw/arm/virt.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/avr/boot.c | 2 +- hw/core/generic-loader.c | 2 +- hw/core/guest-loader.c | 2 +- hw/core/loader-fit.c | 2 +- hw/core/loader.c | 2 +- hw/core/machine.c | 2 +- hw/display/artist.c | 2 +- hw/display/cg3.c | 2 +- hw/display/cirrus_vga_isa.c | 2 +- hw/display/next-fb.c | 2 +- hw/display/ramfb-standalone.c | 2 +- hw/display/ramfb.c | 2 +- hw/display/tcx.c | 2 +- hw/display/vga-isa.c | 2 +- hw/display/vga-pci.c | 2 +- hw/display/vmware_vga.c | 2 +- hw/hppa/machine.c | 2 +- hw/hyperv/syndbg.c | 2 +- hw/i386/microvm.c | 2 +- hw/i386/multiboot.c | 2 +- hw/i386/pc.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/i386/pc_sysfw.c | 2 +- hw/i386/x86-common.c | 2 +- hw/ipmi/ipmi_bmc_sim.c | 2 +- hw/loongarch/boot.c | 2 +- hw/loongarch/virt-fdt-build.c | 2 +- hw/loongarch/virt.c | 2 +- hw/m68k/an5206.c | 2 +- hw/m68k/mcf5208.c | 2 +- hw/m68k/next-cube.c | 2 +- hw/m68k/q800.c | 2 +- hw/m68k/virt.c | 2 +- hw/microblaze/boot.c | 2 +- hw/mips/boston.c | 2 +- hw/mips/fuloong2e.c | 2 +- hw/mips/jazz.c | 2 +- hw/mips/loongson3_virt.c | 2 +- hw/mips/malta.c | 2 +- hw/nubus/nubus-device.c | 2 +- hw/nvram/fw_cfg.c | 2 +- hw/openrisc/boot.c | 2 +- hw/pci/pci.c | 2 +- hw/ppc/amigaone.c | 2 +- hw/ppc/e500.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/pegasos.c | 2 +- hw/ppc/pnv.c | 2 +- hw/ppc/pnv_pnor.c | 2 +- hw/ppc/ppc440_bamboo.c | 2 +- hw/ppc/ppc_booke.c | 2 +- hw/ppc/prep.c | 2 +- hw/ppc/sam460ex.c | 2 +- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_vio.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/riscv/boot.c | 2 +- hw/riscv/microchip_pfsoc.c | 2 +- hw/riscv/sifive_e.c | 2 +- hw/riscv/sifive_u.c | 2 +- hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 2 +- hw/rx/rx-gdbsim.c | 2 +- hw/rx/rx62n.c | 2 +- hw/s390x/ipl.c | 2 +- hw/sh4/r2d.c | 2 +- hw/smbios/smbios.c | 2 +- hw/sparc/leon3.c | 2 +- hw/sparc/sun4m.c | 2 +- hw/sparc64/niagara.c | 2 +- hw/sparc64/sun4u.c | 2 +- hw/tricore/tc27x_soc.c | 2 +- hw/tricore/triboard.c | 2 +- hw/tricore/tricore_testboard.c | 2 +- hw/virtio/vhost-user-scsi-pci.c | 2 +- hw/virtio/virtio-pci.c | 2 +- hw/vmapple/vmapple.c | 2 +- hw/xen/xen_pt_load_rom.c | 2 +- hw/xtensa/sim.c | 2 +- hw/xtensa/virt.c | 2 +- hw/xtensa/xtfpga.c | 2 +- semihosting/arm-compat-semi.c | 2 +- system/device_tree.c | 2 +- system/globals.c | 2 +- system/vl.c | 2 +- target/arm/cpu.c | 2 +- target/loongarch/kvm/kvm.c | 2 +- target/openrisc/interrupt.c | 2 +- target/openrisc/mmu.c | 2 +- target/riscv/kvm/kvm-cpu.c | 2 +- target/rx/cpu.c | 2 +- 116 files changed, 115 insertions(+), 115 deletions(-) rename include/hw/{ =3D> core}/loader.h (100%) diff --git a/include/hw/loader.h b/include/hw/core/loader.h similarity index 100% rename from include/hw/loader.h rename to include/hw/core/loader.h diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h index 51b0e13bd3e..35964bf8318 100644 --- a/include/hw/riscv/boot.h +++ b/include/hw/riscv/boot.h @@ -21,7 +21,7 @@ #define RISCV_BOOT_H =20 #include "exec/cpu-defs.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/riscv/riscv_hart.h" =20 #define RISCV32_BIOS_BIN "opensbi-riscv32-generic-fw_dynamic.bin" diff --git a/hw/acpi/utils.c b/hw/acpi/utils.c index 0c486ea29fa..b7cab6f5ca1 100644 --- a/hw/acpi/utils.c +++ b/hw/acpi/utils.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" -#include "hw/loader.h" +#include "hw/core/loader.h" =20 MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque, GArray *blob, const char *name) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index b6155646ef7..cddd94fec82 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -10,7 +10,7 @@ #include "cpu.h" #include "exec/target_page.h" #include "elf.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "alpha_sys.h" #include "qemu/error-report.h" #include "hw/rtc/mc146818rtc.h" diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index 1886df03839..d7508ee0ecd 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -26,7 +26,7 @@ #include "system/system.h" #include "hw/core/boards.h" #include "hw/usb/hcd-ohci.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "target/arm/cpu-qom.h" =20 #define AW_A10_SRAM_A_BASE 0x00000000 diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index edffc21dd88..6c4c369e991 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -27,7 +27,7 @@ #include "hw/char/serial-mm.h" #include "hw/misc/unimp.h" #include "hw/usb/hcd-ehci.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "system/system.h" #include "hw/arm/allwinner-h3.h" #include "target/arm/cpu-qom.h" diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c index 313bd21fad8..f6d4117a068 100644 --- a/hw/arm/allwinner-r40.c +++ b/hw/arm/allwinner-r40.c @@ -28,7 +28,7 @@ #include "hw/char/serial-mm.h" #include "hw/misc/unimp.h" #include "hw/usb/hcd-ehci.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "system/system.h" #include "hw/arm/allwinner-r40.h" #include "hw/misc/allwinner-r40-dramc.h" diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 7fa1b37630e..8198a83d15c 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -12,7 +12,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "hw/qdev-clock.h" #include "elf.h" diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c index a0cbe50d78d..1678cce416b 100644 --- a/hw/arm/aspeed_ast27x0-fc.c +++ b/hw/arm/aspeed_ast27x0-fc.c @@ -18,7 +18,7 @@ #include "hw/core/boards.h" #include "hw/qdev-clock.h" #include "hw/arm/aspeed_soc.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/arm/boot.h" #include "hw/block/flash.h" #include "hw/arm/aspeed_coprocessor.h" diff --git a/hw/arm/aspeed_soc_common.c b/hw/arm/aspeed_soc_common.c index 78b6ae18f87..84e6458e80a 100644 --- a/hw/arm/aspeed_soc_common.c +++ b/hw/arm/aspeed_soc_common.c @@ -18,7 +18,7 @@ #include "hw/char/serial-mm.h" #include "system/blockdev.h" #include "system/block-backend.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "qemu/datadir.h" =20 =20 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 9b6eaf642e9..d87bcb5b88a 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -24,7 +24,7 @@ #include "system/numa.h" #include "hw/core/boards.h" #include "system/reset.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/mem/memory-device.h" #include "elf.h" #include "system/device_tree.h" diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index d986e8f7a24..ed12f542001 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -31,7 +31,7 @@ #include "hw/arm/digic.h" #include "hw/arm/machines-qom.h" #include "hw/block/flash.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "system/qtest.h" #include "qemu/units.h" #include "qemu/cutils.h" diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 2d8e257ca2a..992edd3ba89 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -31,7 +31,7 @@ #include "system/system.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "hw/arm/exynos4210.h" #include "hw/sd/sdhci.h" diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 82fa9647119..b8c1256328d 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -24,7 +24,7 @@ #include "migration/vmstate.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "net/net.h" #include "system/runstate.h" #include "system/system.h" diff --git a/hw/arm/npcm7xx.c b/hw/arm/npcm7xx.c index ecfae328a96..6d6f6744869 100644 --- a/hw/arm/npcm7xx.c +++ b/hw/arm/npcm7xx.c @@ -19,7 +19,7 @@ #include "hw/arm/boot.h" #include "hw/arm/npcm7xx.h" #include "hw/char/serial-mm.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/misc/unimp.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index c1e100b1e48..fda375eb4c3 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -21,7 +21,7 @@ #include "hw/core/cpu.h" #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_eeprom.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/nvram/eeprom_at24c.h" #include "hw/qdev-core.h" #include "hw/qdev-properties.h" diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c index 3ad7643b4bd..2bf5e132bb5 100644 --- a/hw/arm/npcm8xx.c +++ b/hw/arm/npcm8xx.c @@ -22,7 +22,7 @@ #include "hw/arm/npcm8xx.h" #include "hw/char/serial-mm.h" #include "hw/intc/arm_gic.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/misc/unimp.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c index f775b324027..292f44d807c 100644 --- a/hw/arm/npcm8xx_boards.c +++ b/hw/arm/npcm8xx_boards.c @@ -21,7 +21,7 @@ #include "hw/arm/npcm8xx.h" #include "hw/arm/machines-qom.h" #include "hw/core/cpu.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-core.h" #include "hw/qdev-properties.h" #include "qapi/error.h" diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 910c18213a5..637525a7e3f 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -23,7 +23,7 @@ #include "hw/registerfields.h" #include "qemu/error-report.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "qom/object.h" diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 058df2c4c96..ead28500c73 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -18,7 +18,7 @@ #include "qemu/error-report.h" #include "system/device_tree.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/arm/boot.h" #include "qom/object.h" #include "hw/arm/bcm2838.h" diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 32d4c52bf50..5f0fb16a54c 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -42,7 +42,7 @@ #include "hw/ide/ahci-sysbus.h" #include "hw/intc/arm_gicv3_common.h" #include "hw/intc/arm_gicv3_its_common.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/pci-host/gpex.h" #include "hw/qdev-properties.h" #include "hw/usb/usb.h" diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 2f61ad0dd62..75cb77da828 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -33,7 +33,7 @@ #include "net/net.h" #include "system/system.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/block/flash.h" #include "system/device_tree.h" #include "qemu/error-report.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 6155db2b093..c005eb914cb 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -51,7 +51,7 @@ #include "system/hvf.h" #include "system/qtest.h" #include "system/system.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "qapi/error.h" #include "qemu/bitops.h" #include "qemu/cutils.h" diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index a6dc644d0bd..e127b232d75 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -25,7 +25,7 @@ #include "system/system.h" #include "hw/core/boards.h" #include "hw/block/flash.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/adc/zynq-xadc.h" #include "hw/ssi/ssi.h" #include "hw/usb/chipidea.h" diff --git a/hw/avr/boot.c b/hw/avr/boot.c index e5a29c7218e..838378fb252 100644 --- a/hw/avr/boot.c +++ b/hw/avr/boot.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "qemu/datadir.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "boot.h" #include "qemu/error-report.h" diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index be4fe867e4d..590c6a8131a 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -34,7 +34,7 @@ #include "system/dma.h" #include "system/reset.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c index 07c36464047..e46897c4974 100644 --- a/hw/core/guest-loader.c +++ b/hw/core/guest-loader.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "hw/core/cpu.h" #include "system/dma.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c index 59a625ea57d..233a7f78c24 100644 --- a/hw/core/loader-fit.c +++ b/hw/core/loader-fit.c @@ -21,7 +21,7 @@ #include "qapi/error.h" #include "qemu/units.h" #include "system/memory.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/core/loader-fit.h" #include "qemu/cutils.h" #include "qemu/error-report.h" diff --git a/hw/core/loader.c b/hw/core/loader.c index 385730e8ef5..40cb187a113 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -58,7 +58,7 @@ #include "system/reset.h" #include "system/system.h" #include "uboot_image.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/nvram/fw_cfg.h" #include "system/memory.h" #include "hw/core/boards.h" diff --git a/hw/core/machine.c b/hw/core/machine.c index dea257c3086..59359684cb8 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -15,7 +15,7 @@ #include "qemu/accel.h" #include "system/replay.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/qapi-visit-machine.h" diff --git a/hw/display/artist.c b/hw/display/artist.c index 3c884c92437..5efa9e45ffd 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -15,7 +15,7 @@ #include "qemu/bswap.h" #include "qapi/error.h" #include "hw/sysbus.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-core.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/display/cg3.c b/hw/display/cg3.c index 8191237124e..5ec09b63247 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -31,7 +31,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c index 4b55c48eff8..5cacf4fc127 100644 --- a/hw/display/cirrus_vga_isa.c +++ b/hw/display/cirrus_vga_isa.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "hw/isa/isa.h" #include "cirrus_vga_internal.h" diff --git a/hw/display/next-fb.c b/hw/display/next-fb.c index ec81b766a7e..3d97702fce5 100644 --- a/hw/display/next-fb.c +++ b/hw/display/next-fb.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "ui/console.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "framebuffer.h" #include "ui/pixel_ops.h" #include "hw/m68k/next-cube.h" diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c index 72b2071aed0..130f4e01df0 100644 --- a/hw/display/ramfb-standalone.c +++ b/hw/display/ramfb-standalone.c @@ -2,7 +2,7 @@ #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "hw/display/ramfb.h" #include "ui/console.h" diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index 9a17d97d076..ad12fb1782e 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -13,7 +13,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/display/ramfb.h" #include "hw/display/bochs-vbe.h" /* for limits */ #include "ui/console.h" diff --git a/hw/display/tcx.c b/hw/display/tcx.c index 4853c5e1424..dfe234e3354 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "ui/console.h" #include "ui/pixel_ops.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index 3618913b3b7..d2213b0f3e6 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -30,7 +30,7 @@ #include "ui/pixel_ops.h" #include "qemu/module.h" #include "qemu/timer.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "ui/console.h" #include "qom/object.h" diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index b81f7fd2d0f..7a39bb9b213 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -33,7 +33,7 @@ #include "ui/console.h" #include "qemu/module.h" #include "qemu/timer.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/display/edid.h" #include "qom/object.h" #include "hw/acpi/acpi_aml_interface.h" diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index bc1a8ed4665..7ca5a551426 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -27,7 +27,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "qemu/log.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "trace.h" #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index acd1c3f005b..e877e6c4018 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -9,7 +9,7 @@ #include "qemu/datadir.h" #include "cpu.h" #include "elf.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "qemu/error-report.h" #include "exec/target_page.h" #include "system/reset.h" diff --git a/hw/hyperv/syndbg.c b/hw/hyperv/syndbg.c index bcdfdf6af75..29908e886b4 100644 --- a/hw/hyperv/syndbg.c +++ b/hw/hyperv/syndbg.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "migration/vmstate.h" #include "hw/qdev-properties.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "exec/target_page.h" #include "hw/hyperv/hyperv.h" #include "hw/hyperv/vmbus-bridge.h" diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index e3bafb83af9..8cf99ad6623 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -30,7 +30,7 @@ #include "acpi-microvm.h" #include "microvm-dt.h" =20 -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/core/irq.h" #include "hw/i386/kvm/clock.h" #include "hw/i386/microvm.h" diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 78690781b74..8b6acfee9ba 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -27,7 +27,7 @@ #include "cpu.h" #include "hw/nvram/fw_cfg.h" #include "multiboot.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "exec/target_page.h" #include "system/system.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 0f2a5889022..1478a26f11b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -34,7 +34,7 @@ #include "system/cpus.h" #include "hw/ide/ide-bus.h" #include "hw/timer/hpet.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/rtc/mc146818rtc.h" #include "hw/intc/i8259.h" #include "hw/timer/i8254.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 02de7453baa..5fd2f9d1e0c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -32,7 +32,7 @@ #include "qemu/units.h" #include "hw/acpi/acpi.h" #include "hw/char/parallel-isa.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/rtc/mc146818rtc.h" #include "system/tcg.h" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 1a12b635ad9..4d64aa15550 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -32,7 +32,7 @@ #include "hw/sysbus.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "hw/block/flash.h" #include "system/kvm.h" diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index 27f2f284c81..d2517b52617 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -38,7 +38,7 @@ =20 #include "hw/acpi/cpu_hotplug.h" #include "hw/core/irq.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "multiboot.h" #include "elf.h" #include "standard-headers/asm-x86/bootparam.h" diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 4604d632b1e..9b3e3a4b7e7 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -28,7 +28,7 @@ #include "hw/ipmi/ipmi.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index 8857a049980..711d5ffbbc0 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -9,7 +9,7 @@ #include "qemu/units.h" #include "target/loongarch/cpu.h" #include "hw/loongarch/virt.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "qemu/error-report.h" #include "system/reset.h" diff --git a/hw/loongarch/virt-fdt-build.c b/hw/loongarch/virt-fdt-build.c index 1f0ba01f711..115080d80e2 100644 --- a/hw/loongarch/virt-fdt-build.c +++ b/hw/loongarch/virt-fdt-build.c @@ -9,7 +9,7 @@ #include "hw/acpi/generic_event_device.h" #include "hw/core/sysbus-fdt.h" #include "hw/intc/loongarch_extioi.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/loongarch/virt.h" #include "hw/pci-host/gpex.h" #include "system/device_tree.h" diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 0e11eb340f0..ea53941aeb9 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -22,7 +22,7 @@ #include "system/address-spaces.h" #include "hw/core/irq.h" #include "net/net.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "hw/intc/loongarch_ipi.h" #include "hw/intc/loongarch_extioi.h" diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index f67611ba0b2..f92a5d6a339 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -11,7 +11,7 @@ #include "cpu.h" #include "hw/m68k/mcf.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "qemu/error-report.h" #include "system/qtest.h" diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index b2b02f25ff1..b81305ae6e4 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -30,7 +30,7 @@ #include "system/qtest.h" #include "net/net.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/sysbus.h" #include "elf.h" =20 diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 1411436a463..e7217cbaeac 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -18,7 +18,7 @@ #include "hw/core/irq.h" #include "hw/m68k/next-cube.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/scsi/esp.h" #include "hw/sysbus.h" #include "qom/object.h" diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 1aaaada3465..4c03455d6bd 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -30,7 +30,7 @@ #include "hw/core/boards.h" #include "hw/or-irq.h" #include "elf.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "ui/console.h" #include "hw/char/escc.h" #include "hw/sysbus.h" diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 6f2b7bb5a08..7007d4e4e9f 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -16,7 +16,7 @@ #include "hw/core/boards.h" #include "hw/qdev-properties.h" #include "elf.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "ui/console.h" #include "hw/sysbus.h" #include "standard-headers/asm-m68k/bootinfo.h" diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 39eb2386e8f..8ff99b3339d 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -34,7 +34,7 @@ #include "system/device_tree.h" #include "system/reset.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "qemu/cutils.h" =20 diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 633b2a90523..b4b4a86a5fa 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -25,7 +25,7 @@ #include "hw/char/serial-mm.h" #include "hw/ide/pci.h" #include "hw/ide/ahci-pci.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/core/loader-fit.h" #include "hw/mips/bootloader.h" #include "hw/mips/cps.h" diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index fa252c4b285..d4c100b69a0 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -31,7 +31,7 @@ #include "hw/mips/mips.h" #include "hw/mips/bootloader.h" #include "hw/pci/pci.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/ide/pci.h" #include "hw/qdev-properties.h" #include "elf.h" diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index fdcae4ce90e..fb01af8ece3 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -36,7 +36,7 @@ #include "hw/core/boards.h" #include "net/net.h" #include "hw/scsi/esp.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/rtc/mc146818rtc.h" #include "hw/timer/i8254.h" #include "hw/display/vga.h" diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index 4df6cf13b36..fe51fb66f6f 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -37,7 +37,7 @@ #include "hw/misc/unimp.h" #include "hw/intc/i8259.h" #include "hw/intc/loongson_ipi.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/isa/superio.h" #include "hw/pci/msi.h" #include "hw/pci/pci.h" diff --git a/hw/mips/malta.c b/hw/mips/malta.c index c63d77d4cca..2b0eb8c478e 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -44,7 +44,7 @@ #include "qemu/log.h" #include "hw/ide/pci.h" #include "hw/core/irq.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "qom/object.h" #include "hw/sysbus.h" /* SysBusDevice */ diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c index 1abd9489044..5c5894c9c55 100644 --- a/hw/nubus/nubus-device.c +++ b/hw/nubus/nubus-device.c @@ -12,7 +12,7 @@ #include "qemu/datadir.h" #include "exec/target_page.h" #include "hw/core/irq.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/nubus/nubus.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index b696bf39e12..df07424e553 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -41,7 +41,7 @@ #include "qemu/cutils.h" #include "qapi/error.h" #include "hw/acpi/aml-build.h" -#include "hw/loader.h" +#include "hw/core/loader.h" =20 #define FW_CFG_FILE_SLOTS_DFLT 0x20 =20 diff --git a/hw/openrisc/boot.c b/hw/openrisc/boot.c index db6fea071e8..6256babc42a 100644 --- a/hw/openrisc/boot.c +++ b/hw/openrisc/boot.c @@ -11,7 +11,7 @@ #include "exec/cpu-defs.h" #include "exec/target_page.h" #include "elf.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/openrisc/boot.h" #include "system/device_tree.h" #include "system/qtest.h" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index ffeb3fbf7cf..a3118ac6d0d 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -39,7 +39,7 @@ #include "system/numa.h" #include "system/runstate.h" #include "system/system.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "qemu/error-report.h" #include "qemu/range.h" #include "trace.h" diff --git a/hw/ppc/amigaone.c b/hw/ppc/amigaone.c index 3df4724a72b..4b858443806 100644 --- a/hw/ppc/amigaone.c +++ b/hw/ppc/amigaone.c @@ -15,7 +15,7 @@ #include "qapi/error.h" #include "hw/ppc/ppc.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/pci-host/articia.h" #include "hw/isa/vt82c686.h" #include "hw/ide/pci.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index eeca31dabb9..769f18023d5 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -39,7 +39,7 @@ #include "hw/ppc/openpic_kvm.h" #include "hw/ppc/ppc.h" #include "hw/qdev-properties.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "hw/sysbus.h" #include "qemu/host-utils.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 3a6e47eb8b7..909a4fe257d 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -65,7 +65,7 @@ #include "hw/char/escc.h" #include "hw/misc/macio/macio.h" #include "hw/ppc/openpic.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/core/fw-path-provider.h" #include "elf.h" #include "qemu/error-report.h" diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 8f9ce68b8b0..8400db6c352 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -42,7 +42,7 @@ #include "hw/nvram/fw_cfg.h" #include "hw/char/escc.h" #include "hw/misc/macio/macio.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/core/fw-path-provider.h" #include "elf.h" #include "qemu/error-report.h" diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c index 8b5958e7498..11bf406ef77 100644 --- a/hw/ppc/pegasos.c +++ b/hw/ppc/pegasos.c @@ -25,7 +25,7 @@ #include "system/runstate.h" #include "system/qtest.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/core/fw-path-provider.h" #include "elf.h" #include "qemu/log.h" diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 895132da91b..eb3197da9b1 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -38,7 +38,7 @@ #include "hw/ppc/ppc.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_core.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/nmi.h" #include "qapi/visitor.h" #include "hw/intc/intc.h" diff --git a/hw/ppc/pnv_pnor.c b/hw/ppc/pnv_pnor.c index af7cfd028ba..c7cbc525b33 100644 --- a/hw/ppc/pnv_pnor.c +++ b/hw/ppc/pnv_pnor.c @@ -13,7 +13,7 @@ #include "qemu/units.h" #include "system/block-backend.h" #include "system/blockdev.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/ppc/pnv_pnor.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 824dd91ed5e..9e71037d84c 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -21,7 +21,7 @@ #include "hw/core/boards.h" #include "system/kvm.h" #include "system/device_tree.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "hw/char/serial-mm.h" #include "hw/ppc/ppc.h" diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c index 13403a56b1a..7c6e5df9fde 100644 --- a/hw/ppc/ppc_booke.c +++ b/hw/ppc/ppc_booke.c @@ -29,7 +29,7 @@ #include "qemu/timer.h" #include "system/reset.h" #include "system/runstate.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "kvm_ppc.h" =20 void booke_set_tlb(ppcemb_tlb_t *tlb, target_ulong va, hwaddr pa, diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 0d5e1f604e6..90164face16 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -36,7 +36,7 @@ #include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/datadir.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/rtc/mc146818rtc.h" #include "hw/isa/pc87312.h" #include "hw/qdev-properties.h" diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 992bfe39a36..550aaa21fa2 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -22,7 +22,7 @@ #include "system/device_tree.h" #include "system/block-backend.h" #include "exec/page-protection.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "system/memory.h" #include "ppc440.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7c695ac4ecc..bad6918e6eb 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -61,7 +61,7 @@ #include "hw/core/cpu.h" =20 #include "hw/ppc/ppc.h" -#include "hw/loader.h" +#include "hw/core/loader.h" =20 #include "hw/ppc/fdt.h" #include "hw/ppc/spapr.h" diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index c21a2a3274e..875c17f4784 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -24,7 +24,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "qemu/log.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "hw/sysbus.h" #include "system/kvm.h" diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 8221a01639d..8b5f4eb57a0 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -34,7 +34,7 @@ #include "system/reset.h" #include "hw/core/boards.h" #include "system/device_tree.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 4f207dee287..df1f3abd171 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -23,7 +23,7 @@ #include "qemu/error-report.h" #include "exec/cpu-defs.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/riscv/boot.h" #include "hw/riscv/boot_opensbi.h" #include "elf.h" diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index 4398f7b1825..9de6456c141 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -41,7 +41,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/sysbus.h" #include "chardev/char.h" #include "hw/cpu/cluster.h" diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index abe411e305e..c2032176c43 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -33,7 +33,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/sysbus.h" #include "hw/misc/unimp.h" #include "target/riscv/cpu.h" diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 00438d2e596..3e081ddf37e 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -41,7 +41,7 @@ #include "qapi/visitor.h" #include "hw/core/boards.h" #include "hw/core/irq.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/sysbus.h" #include "hw/cpu/cluster.h" #include "hw/misc/unimp.h" diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 6aa688acf30..c9451d7e3b3 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -26,7 +26,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/sysbus.h" #include "target/riscv/cpu.h" #include "hw/riscv/riscv_hart.h" diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 45a845318e7..0505bffa44a 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -24,7 +24,7 @@ #include "qemu/guest-random.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/sysbus.h" #include "hw/qdev-properties.h" #include "hw/char/serial-mm.h" diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c index 1a33082857c..0a0ad85a35a 100644 --- a/hw/rx/rx-gdbsim.c +++ b/hw/rx/rx-gdbsim.c @@ -22,7 +22,7 @@ #include "qemu/guest-random.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/rx/rx62n.h" #include "system/qtest.h" #include "system/device_tree.h" diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c index a2a243afa41..3fe9a4a518c 100644 --- a/hw/rx/rx62n.c +++ b/hw/rx/rx62n.c @@ -25,7 +25,7 @@ #include "qemu/error-report.h" #include "qemu/units.h" #include "hw/rx/rx62n.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/sysbus.h" #include "hw/qdev-properties.h" #include "system/system.h" diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index f1c2af15f75..e0a04ab1a22 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -19,7 +19,7 @@ #include "system/runstate.h" #include "system/tcg.h" #include "elf.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "hw/core/boards.h" #include "hw/s390x/virtio-ccw.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 5352f23ae82..9e8c2fa8d12 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -40,7 +40,7 @@ #include "sh7750_regs.h" #include "hw/ide/mmio.h" #include "hw/core/irq.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/usb/usb.h" #include "hw/block/flash.h" #include "exec/tswap.h" diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 071c3b5e629..be97a5effcc 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -25,7 +25,7 @@ #include "system/system.h" #include "qemu/uuid.h" #include "hw/firmware/smbios.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/core/boards.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_device.h" diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 500b63bc9b7..cd1a03a5584 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -38,7 +38,7 @@ #include "system/qtest.h" #include "system/reset.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "trace.h" =20 diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index fa5592f26cb..b6256864582 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -51,7 +51,7 @@ #include "hw/misc/unimp.h" #include "hw/core/irq.h" #include "hw/or-irq.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "trace.h" #include "qom/object.h" diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 334bec14ba3..209be380473 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -29,7 +29,7 @@ #include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "hw/misc/unimp.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/sparc/sparc64.h" #include "hw/rtc/sun4v-rtc.h" #include "system/block-backend.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 5b25ba81cc8..c0fb421d2ba 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -53,7 +53,7 @@ #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" #include "hw/ide/pci.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/core/fw-path-provider.h" #include "elf.h" #include "trace.h" diff --git a/hw/tricore/tc27x_soc.c b/hw/tricore/tc27x_soc.c index f3b84980e52..e1a97a43874 100644 --- a/hw/tricore/tc27x_soc.c +++ b/hw/tricore/tc27x_soc.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sysbus.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "qemu/units.h" #include "hw/misc/unimp.h" =20 diff --git a/hw/tricore/triboard.c b/hw/tricore/triboard.c index cb45b01d2d2..db6f2b765ac 100644 --- a/hw/tricore/triboard.c +++ b/hw/tricore/triboard.c @@ -23,7 +23,7 @@ #include "qapi/error.h" #include "hw/qdev-properties.h" #include "net/net.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "hw/tricore/tricore.h" #include "qemu/error-report.h" diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index 21b119712c5..60772d4f1d7 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -24,7 +24,7 @@ #include "cpu.h" #include "net/net.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "hw/tricore/tricore.h" #include "hw/tricore/tricore_testdevice.h" diff --git a/hw/virtio/vhost-user-scsi-pci.c b/hw/virtio/vhost-user-scsi-pc= i.c index 994e51a37bb..367b8f27da5 100644 --- a/hw/virtio/vhost-user-scsi-pci.c +++ b/hw/virtio/vhost-user-scsi-pci.c @@ -28,7 +28,7 @@ #include "qemu/module.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "system/kvm.h" #include "hw/virtio/virtio-pci.h" #include "qom/object.h" diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 263e112a5cb..7382e7db6fa 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -33,7 +33,7 @@ #include "qemu/bswap.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "system/accel-irq.h" #include "system/kvm.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index 9154a4c2576..ad513d4cbc1 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -27,7 +27,7 @@ #include "monitor/qdev.h" #include "hw/core/boards.h" #include "hw/core/irq.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "hw/usb/usb.h" diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c index 6bc64acd335..319efcad6ef 100644 --- a/hw/xen/xen_pt_load_rom.c +++ b/hw/xen/xen_pt_load_rom.c @@ -4,7 +4,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/pci/pci.h" #include "xen_pt.h" =20 diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index 37acc562d21..994460d0414 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -30,7 +30,7 @@ #include "system/reset.h" #include "system/system.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "elf.h" #include "system/memory.h" #include "qemu/error-report.h" diff --git a/hw/xtensa/virt.c b/hw/xtensa/virt.c index b9e324c2850..271f06e0953 100644 --- a/hw/xtensa/virt.c +++ b/hw/xtensa/virt.c @@ -29,7 +29,7 @@ #include "qapi/error.h" #include "system/reset.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/pci-host/gpex.h" #include "net/net.h" #include "elf.h" diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 694456aa0a1..a96abcd4bdd 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -31,7 +31,7 @@ #include "cpu.h" #include "system/system.h" #include "hw/core/boards.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/qdev-properties.h" #include "elf.h" #include "system/memory.h" diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index 2e9fa5842f6..5e5f181b908 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -47,7 +47,7 @@ #define COMMON_SEMI_HEAP_SIZE (128 * 1024 * 1024) #else #include "qemu/cutils.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/core/boards.h" #endif =20 diff --git a/system/device_tree.c b/system/device_tree.c index 3ccdf33374c..1ea19629841 100644 --- a/system/device_tree.c +++ b/system/device_tree.c @@ -24,7 +24,7 @@ #include "qemu/cutils.h" #include "qemu/guest-random.h" #include "system/device_tree.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/core/boards.h" #include "qemu/config-file.h" #include "qapi/qapi-commands-machine.h" diff --git a/system/globals.c b/system/globals.c index 98f9876d5d4..c33f6ed3902 100644 --- a/system/globals.c +++ b/system/globals.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "exec/cpu-common.h" #include "hw/display/vga.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/xen/xen.h" #include "net/net.h" #include "system/cpus.h" diff --git a/system/vl.c b/system/vl.c index cdf32c119b2..659c6506fc7 100644 --- a/system/vl.c +++ b/system/vl.c @@ -62,7 +62,7 @@ #include "hw/firmware/smbios.h" #include "hw/acpi/acpi.h" #include "hw/xen/xen.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "monitor/qdev.h" #include "net/net.h" #include "net/slirp.h" diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 7720d27a3c0..09e89272edc 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -36,7 +36,7 @@ #include "exec/target_page.h" #include "hw/qdev-properties.h" #if !defined(CONFIG_USER_ONLY) -#include "hw/loader.h" +#include "hw/core/loader.h" #include "hw/core/boards.h" #ifdef CONFIG_TCG #include "hw/intc/armv7m_nvic.h" diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c index 8ed62acf84d..ef3359ced92 100644 --- a/target/loongarch/kvm/kvm.c +++ b/target/loongarch/kvm/kvm.c @@ -23,7 +23,7 @@ #include "hw/core/irq.h" #include "hw/loongarch/virt.h" #include "qemu/log.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "system/runstate.h" #include "cpu-csr.h" #include "kvm_loongarch.h" diff --git a/target/openrisc/interrupt.c b/target/openrisc/interrupt.c index d357aaa7da1..5528b80e7b8 100644 --- a/target/openrisc/interrupt.c +++ b/target/openrisc/interrupt.c @@ -23,7 +23,7 @@ #include "gdbstub/helpers.h" #include "qemu/host-utils.h" #ifndef CONFIG_USER_ONLY -#include "hw/loader.h" +#include "hw/core/loader.h" #endif #include "qemu/plugin.h" =20 diff --git a/target/openrisc/mmu.c b/target/openrisc/mmu.c index ffb732e0d1f..b2b2b3c4a98 100644 --- a/target/openrisc/mmu.c +++ b/target/openrisc/mmu.c @@ -26,7 +26,7 @@ #include "exec/target_page.h" #include "gdbstub/helpers.h" #include "qemu/host-utils.h" -#include "hw/loader.h" +#include "hw/core/loader.h" =20 static void get_phys_nommu(hwaddr *phys_addr, int *prot, vaddr address) { diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 1d99e5f4908..5d792563b91 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -41,7 +41,7 @@ #include "hw/core/irq.h" #include "hw/intc/riscv_imsic.h" #include "qemu/log.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "kvm_riscv.h" #include "sbi_ecall_interface.h" #include "chardev/char-fe.h" diff --git a/target/rx/cpu.c b/target/rx/cpu.c index da02ae7bf88..f5f4f3ba4ab 100644 --- a/target/rx/cpu.c +++ b/target/rx/cpu.c @@ -25,7 +25,7 @@ #include "exec/page-protection.h" #include "exec/translation-block.h" #include "exec/target_page.h" -#include "hw/loader.h" +#include "hw/core/loader.h" #include "fpu/softfloat.h" #include "tcg/debug-assert.h" #include "accel/tcg/cpu-ops.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764252296; cv=none; d=zohomail.com; s=zohoarc; b=Hmb/44CdWLei8Z47FcY+hQam/dA7y4Hv+ngdGj3cMz8rbfeZO0nq5nXaHDVYf8umnuf9Z9sOGCQd/U2ErdlhnMXyNLcWcNcNsjz11pV7ztR+L2135r52obiaWFe/QIkN7vppmqx/2MqN8470luGQuKfUdTI+C/EOv4YsDRFBfMU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764252296; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=jcN7YixdqgD2I0jjuWdi/Wse33GaDQqib2V9SQiQ7HY=; b=guJzx7vTsz6N8t9xVomoFgq9M9BBf0a4Hiy2Uc/aoczkjnXerUNVZW+Ztd0bkivAi+hADHmZyiN2gUptZtYAHUiuWS1/VDxYYt4yNDpvHSU0LeN6P5dDW8dfvlaY4VJTr1iFQv6SajRrp0FmR95epbJmpY1tY6q3pSTsqnpF4HA= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764252296366934.8479794031751; Thu, 27 Nov 2025 06:04:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObqj-0002e7-By; Thu, 27 Nov 2025 08:15:53 -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 1vObqd-0002dN-TP for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:48 -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 1vObqc-0001Fs-6z for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:47 -0500 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-614-KYidxUA5PQ2ZSYQ4RJTh_A-1; Thu, 27 Nov 2025 08:15:41 -0500 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-6417677bf55so2847253a12.1 for ; Thu, 27 Nov 2025 05:15:41 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f5a2176csm159001766b.57.2025.11.27.05.15.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jcN7YixdqgD2I0jjuWdi/Wse33GaDQqib2V9SQiQ7HY=; b=YiUL8s18B3Un9lSCeaQx+lJe2yy6NmyPxzmdYNQYWJnm9+pQrkdKiwMkfBPYWVIolKFRBo lTV4kVUkqsp6WMnmAm9bKwUcqhBPn1l6o0M42KmMP3gCUhjSIqYpRt0bC+riaZRysX6s5U JfyCotn9ZQm+cH2gs8z1yj8M0Ec+yF4= X-MC-Unique: KYidxUA5PQ2ZSYQ4RJTh_A-1 X-Mimecast-MFC-AGG-ID: KYidxUA5PQ2ZSYQ4RJTh_A_1764249340 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249339; x=1764854139; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jcN7YixdqgD2I0jjuWdi/Wse33GaDQqib2V9SQiQ7HY=; b=hZCLaBy8O15fYyyfEiWSP+ZQ4y+4+cOl0HWP0uKkt1KBpPOyK0Ckw89J/8Cwcu/5Ia mrHVjntdVfR1HXjX26e4xsWlL90p0H8U/krpXToAMGAiE8wZLXyx+4Qv1qCYmZ43O2E7 r+cDEGXqKkcuQhuWMvMW7Yis8qYKauWOuybKyovDdyva7VPG2fcVJQwrfWjwaTwLo59y qTqs+J70BneuPGZ3yJPe847Viq13ICXNYvJFH4y9XXEBKFm7ZWMECe2W5MzQhoBAuvrT EVtdSdX89E+4LMh8m1WuMkcLl9WbUBAjP3gGtIoIt6oBwhr3HFpUyE0pRAqYFezuhAP0 CHaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249339; x=1764854139; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=jcN7YixdqgD2I0jjuWdi/Wse33GaDQqib2V9SQiQ7HY=; b=EpBWqH3oQylZaj7+r6jsE73EP6gwD4bsnWHlX22STQiDxS3/5Qo5t6EFyeug9Vp2WZ l/0TMvLBWDxNtD9hI1R+2JwSJ+eKXnypUFqOb1b8yTQkB8HZYOJjPANskJFQ0JuAqfbS omh3dbFW/bg2wSY5pEIyGqof47blMHCXrbeZV67zrr+GC/XIHDLvrXdKBZft09pZ8dZc guB1zLZzLQa7AajUmDx9fozink3JRlZ5Goy7LdA79UTCQLzQrn6tG/muF6M4h/ASjy9r 8K0ZV3C4SmPhvUvBA38N0YrZfivYepINaunU5Fs/fSkUIhK+a5XwsE3nQI6O0/0RBC+/ Httw== X-Gm-Message-State: AOJu0YzoWzJB/CeAxPaDyrmVkar55ggcjjW1ZPX7KfEtw8esAI+6V8IS MBgh33M5py4n4SGBRwuTUl9uoiCkyuwb06MHgJCSAp7TwkKIFtUY2Kcp646DjCetKBUkdYHTj+o +mln2kg9b2WJEE4AH9HPhd1By9AfR5B1wAs2kd1/TtvEr2nUvunWBGIg77Kek6fK6QlrCzrP3VT Fx5dYUpvx/eUd59SJ8nzBPlKFv0LSmDOD7olIWc5UL X-Gm-Gg: ASbGncumK3NT3GQ45ZrCfVcybG/UYuJipRpfb/wejZaEyDjcN4A10OKBV6TFsGMP1s2 RHQjFrTOvKoAH44lllJUbXDWD4MZKmrRrGRJ3WUxNyypVYOACDp0QIZ9PgwbyydFytR0ftRhoNL olCKmDjqRduGVtKVTLcf+rztGX/MCjUqiCxJgVfWN34dc40RWm9ybTmnXrE3GQ/1Y0YwNuS1XHB SI0wVEVEVL/NK9jUXFmu4iMc2IKnJmhLeWbPALg9RLOj1wS181PqY31n0gPL/EvPuJVFqEJG0xg G8il2kVrsdASLJDbELQSW3TQ2LYve2hK2AYJz/vIeBWbCWXRPeasNdFAFPu+1YwsYz8pjdyWhhV FjBpDynAOr+fQ5xPyWDxkNjELQi7RSUM1WMLSw4a5I1GqLAKKQcwVOFR7CVOeiZ0YPt3pYeDOxh QMLG9BulLHe3VsBUs= X-Received: by 2002:a17:907:3f24:b0:b71:60a3:a8b9 with SMTP id a640c23a62f3a-b766efb46c4mr2855696466b.29.1764249339424; Thu, 27 Nov 2025 05:15:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IEJ7ZVbmwg4kPbWtagkyeh4/BrTR+NoJ1LLYKAvAE1+5SeiXwnbmG2gMPNHkr9QVwCxDQxI/A== X-Received: by 2002:a17:907:3f24:b0:b71:60a3:a8b9 with SMTP id a640c23a62f3a-b766efb46c4mr2855691166b.29.1764249338828; Thu, 27 Nov 2025 05:15:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 12/28] include: move hw/nmi.h to hw/core/ Date: Thu, 27 Nov 2025 14:14:59 +0100 Message-ID: <20251127131516.80807-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764252298377019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- include/hw/{ =3D> core}/nmi.h | 0 hw/core/nmi.c | 2 +- hw/hppa/machine.c | 2 +- hw/i386/x86.c | 2 +- hw/intc/m68k_irqc.c | 2 +- hw/ipmi/ipmi.c | 2 +- hw/m68k/q800-glue.c | 2 +- hw/misc/macio/gpio.c | 2 +- hw/ppc/pnv.c | 2 +- hw/ppc/spapr.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- hw/watchdog/watchdog.c | 2 +- system/cpus.c | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename include/hw/{ =3D> core}/nmi.h (100%) diff --git a/include/hw/nmi.h b/include/hw/core/nmi.h similarity index 100% rename from include/hw/nmi.h rename to include/hw/core/nmi.h diff --git a/hw/core/nmi.c b/hw/core/nmi.c index a7bce8a04a1..4b447e126ba 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/nmi.h" +#include "hw/core/nmi.h" #include "qapi/error.h" #include "qemu/module.h" #include "monitor/monitor.h" diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index e877e6c4018..960aefc9e26 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -23,7 +23,7 @@ #include "hw/intc/i8259.h" #include "hw/input/lasips2.h" #include "hw/net/lasi_82596.h" -#include "hw/nmi.h" +#include "hw/core/nmi.h" #include "hw/usb/usb.h" #include "hw/pci/pci.h" #include "hw/pci/pci_device.h" diff --git a/hw/i386/x86.c b/hw/i386/x86.c index f80533df1c5..c29856c810a 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -35,7 +35,7 @@ #include "hw/i386/x86.h" #include "hw/i386/topology.h" =20 -#include "hw/nmi.h" +#include "hw/core/nmi.h" #include "kvm/kvm_i386.h" =20 =20 diff --git a/hw/intc/m68k_irqc.c b/hw/intc/m68k_irqc.c index 2532322618a..67cb9acb418 100644 --- a/hw/intc/m68k_irqc.c +++ b/hw/intc/m68k_irqc.c @@ -11,7 +11,7 @@ #include "cpu.h" #include "migration/vmstate.h" #include "hw/qdev-properties.h" -#include "hw/nmi.h" +#include "hw/core/nmi.h" #include "hw/intc/intc.h" #include "hw/intc/m68k_irqc.h" =20 diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c index b91e487e1b8..2a7bc667ec3 100644 --- a/hw/ipmi/ipmi.c +++ b/hw/ipmi/ipmi.c @@ -29,7 +29,7 @@ #include "system/runstate.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/nmi.h" +#include "hw/core/nmi.h" =20 static uint32_t ipmi_current_uuid =3D 1; =20 diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c index 94f47175ae5..84dd01459cd 100644 --- a/hw/m68k/q800-glue.c +++ b/hw/m68k/q800-glue.c @@ -25,7 +25,7 @@ #include "hw/m68k/q800-glue.h" #include "hw/core/boards.h" #include "hw/core/irq.h" -#include "hw/nmi.h" +#include "hw/core/nmi.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" =20 diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c index 9fed4265676..77658cb6d02 100644 --- a/hw/misc/macio/gpio.c +++ b/hw/misc/macio/gpio.c @@ -29,7 +29,7 @@ #include "hw/misc/macio/macio.h" #include "hw/misc/macio/gpio.h" #include "hw/core/irq.h" -#include "hw/nmi.h" +#include "hw/core/nmi.h" #include "qemu/log.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index eb3197da9b1..8a50e9f0d85 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -39,7 +39,7 @@ #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_core.h" #include "hw/core/loader.h" -#include "hw/nmi.h" +#include "hw/core/nmi.h" #include "qapi/visitor.h" #include "hw/intc/intc.h" #include "hw/ipmi/ipmi.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index bad6918e6eb..7363e533e15 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -82,7 +82,7 @@ #include "qemu/config-file.h" #include "qemu/error-report.h" #include "trace.h" -#include "hw/nmi.h" +#include "hw/core/nmi.h" #include "hw/intc/intc.h" =20 #include "hw/ppc/spapr_cpu_core.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 29d95be2c64..c5e0691a26d 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -35,7 +35,7 @@ #include "hw/s390x/ap-bridge.h" #include "migration/register.h" #include "target/s390x/cpu_models.h" -#include "hw/nmi.h" +#include "hw/core/nmi.h" #include "hw/qdev-properties.h" #include "hw/s390x/tod.h" #include "system/system.h" diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c index 07213739488..0842fe373ae 100644 --- a/hw/watchdog/watchdog.c +++ b/hw/watchdog/watchdog.c @@ -28,7 +28,7 @@ #include "qapi/qapi-events-run-state.h" #include "system/runstate.h" #include "system/watchdog.h" -#include "hw/nmi.h" +#include "hw/core/nmi.h" #include "qemu/help_option.h" #include "trace.h" =20 diff --git a/system/cpus.c b/system/cpus.c index 0b1eabd3c4b..a0e1debfea8 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -39,7 +39,7 @@ #include "qemu/plugin.h" #include "system/cpus.h" #include "qemu/guest-random.h" -#include "hw/nmi.h" +#include "hw/core/nmi.h" #include "system/replay.h" #include "system/runstate.h" #include "system/cpu-timers.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764250822; cv=none; d=zohomail.com; s=zohoarc; b=CkMFvDVBADMvLQuLUjYsJiUxS9h6XmMT6qFXQnoxyz7Ox5QpIST8in0wSdQmYW7WJeA8QvRbQMgZOnBEv7p/AKaD+oe5v4TKcrah4AorkQ+dKJHXRjQJUe/ZIBs6PSx3FG6jys6R9usHRu5T+3PJxd6wEdyzCm3b/VMWq4yB0GQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764250822; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=IAHvRgvvKwLL73VIlz6jx5tFhzH+NwkRqY+7ivGH24I=; b=UOSNdcY7+3gHWHn0guD9rz4bzzxX0ybiTf2qmCeRNdAbO2w8Ev4EQFkJ+D8SlwJZ9j4KJu3eQdt1Lq//sAjYJIOJqrbclIOrsEZMmvwuINbvqefNfTUfjkRW1QFWG8p9+FW1JywLODuULi8QxhzAvzflQTT01two8KBRuwfcDiA= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764250822773162.43332671418239; Thu, 27 Nov 2025 05:40:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObr8-0002fv-Sp; Thu, 27 Nov 2025 08:16:22 -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 1vObqe-0002dO-5X for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vObqc-0001Fq-4d for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:47 -0500 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-573-LMX1KkJnP6e02Sx6HLXD8Q-1; Thu, 27 Nov 2025 08:15:43 -0500 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-b763acb793fso81482066b.3 for ; Thu, 27 Nov 2025 05:15:43 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f5163903sm170861866b.7.2025.11.27.05.15.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IAHvRgvvKwLL73VIlz6jx5tFhzH+NwkRqY+7ivGH24I=; b=dbWed6jAHp6rI3h5JROpD6P2TUXmqlb/Q2xbqYkTXoldl7yLw9ps3xf1enpI6mDRNIZufc 19MrrDMGEK1HqstVMbcENYl29Cv9L9GNPF5Yla6G3wZ1OdNDa+SxcHda0ulEtTUeogw/G4 Erts/gvsQLI1o9W0upIV/6oanx6vVks= X-MC-Unique: LMX1KkJnP6e02Sx6HLXD8Q-1 X-Mimecast-MFC-AGG-ID: LMX1KkJnP6e02Sx6HLXD8Q_1764249342 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249341; x=1764854141; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IAHvRgvvKwLL73VIlz6jx5tFhzH+NwkRqY+7ivGH24I=; b=moQCh85mdjiE1R08TGs8xaXoX4JwYxqCM9HunQ93C2JhlxiJfF5+PV7peQG6ZtEzlX 5yuRIVTMLq5kppD9j4PeRrlYJbq5xIfQ+T+0bScexJvTjxrtCzKxHVGe5KH5A403vt4p ByzeMO/G2o0JOzf5R8X3E4SOSWBgK7ql3BNg9zlR8JW05PS5C9vTzpEZm+LEwbz8ffO8 0CHlUv4sQv8CMJDDE98moCDuA+4Go1btuShKtHMr8e17cf4eO5JtzY+R3tTMF1jSobwc saPA8W6u5s/9ydextXH159xjHwpht05b8Lnk419w0eMn928LM2wlp82LuG6q4rC33PGt Bh2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249341; x=1764854141; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=IAHvRgvvKwLL73VIlz6jx5tFhzH+NwkRqY+7ivGH24I=; b=GAASYGhwYl/rAF/UX2uaNjv9CiIDgwOdo1BcQRIfRBcxv7jZdA7EvJOyz3aO3JSPmc I3tAqsOHnMVI74F/pC1SQQSWwoYLkW5CpmJG2Ldmc1OQzUN8HIW+Hifp765BeCWDSsr/ MHmEyqhzFi2ctP5uhiepgeIlfUwH0ZSJ4+9IFZyhzqnebTV6Gq8Z1+jI9DCHgZFyXiFr PefUYuu9V6Ib/Ylwbh4zSLEe1qpwrUyYUw0m6qEp28u82gRzzH1wANq1APwiQQJeWj9K lvnRk7p4MQ1uQSWDrgJ8FljGNZnDyptY0AYKMEeMs0G38vvgaNcEDmM/D1Celewk5l43 i0nw== X-Gm-Message-State: AOJu0Yx2sBha+ER3dUJjdIzjrVxhQyQJQdrwY6JMULi4vtyH03XbwRRv be2p3BrGBXyS4drQ2GO2mSWb120qs8oAoYR68wmMlnh05YRHRbXYZOl8hKOpqCbMMQaHeonUpu0 nIIxm8fZ/pH7AJRrW5u7cBigji3kasMIFvfpM+Py7ixUPtirsKbbHGxwVA3mhx99k7CuM1tyR2E duA0hmL/9G60tYLCnkhqS1+AcUMHMndeHnpCjtTBYW X-Gm-Gg: ASbGncv+dNDu+nkFKxgFScdV1sXuhSuojoiCUdACDG98pQQvPMHg4BVR/e92ngcGhAg 5HrYT2lm0B5cPa8TGYlT1SdkF8cusvDd7qumQekNSaCyMjuz3QX+sYfrrWCYXkX2F+pjzCIxRLl bu3PnYyCBMx6YNZxJLdvbKUpHfXw7IHp3ErmIxU6ar0K7ARfGgzojyxFlkPJ8P8rqiQYspF4/DH 6R8xE4UXLX1tlH//2qc0n5SQyB2X0PlV0t155bd5+8sFw06fnBshOaUW8ptVbsLfaGwPG1udrPR bpTIpOOR3iO4i5y+FN0iJ9Y8M61TnOp9YbhMGg0c3OtkWFiCoBMMeXvmSKkBYZD7GvtobGpzEPp J0hGZnVUxBSW9P6Sx9Bd1hSDGT3Qp1MYNsC+9gFGF6p7fwo/tefPhAp9sE4L/J8oqxtVOVOCa6g rj6+KOM0QB3jwBouY= X-Received: by 2002:a17:906:5958:b0:b76:edfa:9296 with SMTP id a640c23a62f3a-b76edfa9470mr279456566b.44.1764249341191; Thu, 27 Nov 2025 05:15:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IHPNb2hNmK8+9QY9oqD8/GZehi1Mcx0qyMwlMozP77nyMKZZdHs5yh7NjPL+wSAJFNag+F5Cw== X-Received: by 2002:a17:906:5958:b0:b76:edfa:9296 with SMTP id a640c23a62f3a-b76edfa9470mr279448866b.44.1764249340054; Thu, 27 Nov 2025 05:15:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 13/28] include: move hw/or-irq.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:00 +0100 Message-ID: <20251127131516.80807-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764250828175019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- include/hw/arm/armsse.h | 2 +- include/hw/arm/bcm2835_peripherals.h | 2 +- include/hw/arm/exynos4210.h | 2 +- include/hw/arm/fsl-imx6.h | 2 +- include/hw/arm/fsl-imx7.h | 2 +- include/hw/arm/fsl-imx8mp.h | 2 +- include/hw/arm/max78000_soc.h | 2 +- include/hw/arm/stm32f205_soc.h | 2 +- include/hw/arm/stm32f405_soc.h | 2 +- include/hw/arm/stm32l4x5_soc.h | 2 +- include/hw/arm/xlnx-zynqmp.h | 2 +- include/hw/{ =3D> core}/or-irq.h | 0 include/hw/intc/aspeed_intc.h | 2 +- include/hw/m68k/q800.h | 2 +- hw/arm/mps2-tz.c | 2 +- hw/arm/mps2.c | 2 +- hw/arm/mps3r.c | 2 +- hw/arm/musicpal.c | 2 +- hw/arm/stm32l4x5_soc.c | 2 +- hw/arm/xlnx-versal.c | 2 +- hw/core/or-irq.c | 2 +- hw/m68k/q800.c | 2 +- hw/pci-host/raven.c | 2 +- hw/ppc/pegasos.c | 2 +- hw/sparc/sun4m.c | 2 +- 25 files changed, 24 insertions(+), 24 deletions(-) rename include/hw/{ =3D> core}/or-irq.h (100%) diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h index 04755ed1ec3..414e553600d 100644 --- a/include/hw/arm/armsse.h +++ b/include/hw/arm/armsse.h @@ -109,7 +109,7 @@ #include "hw/misc/armsse-mhu.h" #include "hw/misc/armsse-cpu-pwrctrl.h" #include "hw/misc/unimp.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/core/clock.h" #include "hw/core/split-irq.h" #include "hw/cpu/cluster.h" diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_= peripherals.h index 1eeaeec9e0e..d46d892956d 100644 --- a/include/hw/arm/bcm2835_peripherals.h +++ b/include/hw/arm/bcm2835_peripherals.h @@ -17,7 +17,7 @@ #include "hw/char/bcm2835_aux.h" #include "hw/display/bcm2835_fb.h" #include "hw/dma/bcm2835_dma.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/intc/bcm2835_ic.h" #include "hw/misc/bcm2835_property.h" #include "hw/misc/bcm2835_rng.h" diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h index d33fe385865..fbe4370219d 100644 --- a/include/hw/arm/exynos4210.h +++ b/include/hw/arm/exynos4210.h @@ -24,7 +24,7 @@ #ifndef EXYNOS4210_H #define EXYNOS4210_H =20 -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/sysbus.h" #include "hw/cpu/a9mpcore.h" #include "hw/intc/exynos4210_gic.h" diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h index 124bbd478fd..5520473ba0b 100644 --- a/include/hw/arm/fsl-imx6.h +++ b/include/hw/arm/fsl-imx6.h @@ -33,7 +33,7 @@ #include "hw/usb/chipidea.h" #include "hw/usb/imx-usb-phy.h" #include "hw/pci-host/designware.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "system/memory.h" #include "cpu.h" #include "qom/object.h" diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index aa7818c4999..710831c8bf5 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -36,7 +36,7 @@ #include "hw/net/imx_fec.h" #include "hw/pci-host/designware.h" #include "hw/usb/chipidea.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "cpu.h" #include "qom/object.h" #include "qemu/units.h" diff --git a/include/hw/arm/fsl-imx8mp.h b/include/hw/arm/fsl-imx8mp.h index d016f7d3371..1275df22f19 100644 --- a/include/hw/arm/fsl-imx8mp.h +++ b/include/hw/arm/fsl-imx8mp.h @@ -18,7 +18,7 @@ #include "hw/misc/imx8mp_analog.h" #include "hw/misc/imx8mp_ccm.h" #include "hw/net/imx_fec.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/pci-host/designware.h" #include "hw/pci-host/fsl_imx8m_phy.h" #include "hw/sd/sdhci.h" diff --git a/include/hw/arm/max78000_soc.h b/include/hw/arm/max78000_soc.h index a203079ee9a..1a6cdb39495 100644 --- a/include/hw/arm/max78000_soc.h +++ b/include/hw/arm/max78000_soc.h @@ -9,7 +9,7 @@ #ifndef HW_ARM_MAX78000_SOC_H #define HW_ARM_MAX78000_SOC_H =20 -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/arm/armv7m.h" #include "hw/misc/max78000_aes.h" #include "hw/misc/max78000_gcr.h" diff --git a/include/hw/arm/stm32f205_soc.h b/include/hw/arm/stm32f205_soc.h index d3de6b94dab..745433b56c2 100644 --- a/include/hw/arm/stm32f205_soc.h +++ b/include/hw/arm/stm32f205_soc.h @@ -29,7 +29,7 @@ #include "hw/timer/stm32f2xx_timer.h" #include "hw/char/stm32f2xx_usart.h" #include "hw/adc/stm32f2xx_adc.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/ssi/stm32f2xx_spi.h" #include "hw/arm/armv7m.h" #include "hw/core/clock.h" diff --git a/include/hw/arm/stm32f405_soc.h b/include/hw/arm/stm32f405_soc.h index 2eeada64ded..9fe40da9680 100644 --- a/include/hw/arm/stm32f405_soc.h +++ b/include/hw/arm/stm32f405_soc.h @@ -31,7 +31,7 @@ #include "hw/char/stm32f2xx_usart.h" #include "hw/adc/stm32f2xx_adc.h" #include "hw/misc/stm32f4xx_exti.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/ssi/stm32f2xx_spi.h" #include "hw/arm/armv7m.h" #include "qom/object.h" diff --git a/include/hw/arm/stm32l4x5_soc.h b/include/hw/arm/stm32l4x5_soc.h index c2fae6e23fe..9c3d662bca9 100644 --- a/include/hw/arm/stm32l4x5_soc.h +++ b/include/hw/arm/stm32l4x5_soc.h @@ -26,7 +26,7 @@ =20 #include "system/memory.h" #include "hw/arm/armv7m.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/misc/stm32l4x5_syscfg.h" #include "hw/misc/stm32l4x5_exti.h" #include "hw/misc/stm32l4x5_rcc.h" diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index a3117bd6c50..620b20d0e2a 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -37,7 +37,7 @@ #include "hw/dma/xlnx_csu_dma.h" #include "hw/nvram/xlnx-bbram.h" #include "hw/nvram/xlnx-zynqmp-efuse.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/misc/xlnx-zynqmp-apu-ctrl.h" #include "hw/misc/xlnx-zynqmp-crf.h" #include "hw/timer/cadence_ttc.h" diff --git a/include/hw/or-irq.h b/include/hw/core/or-irq.h similarity index 100% rename from include/hw/or-irq.h rename to include/hw/core/or-irq.h diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h index 51288384a56..6dd8effcd89 100644 --- a/include/hw/intc/aspeed_intc.h +++ b/include/hw/intc/aspeed_intc.h @@ -10,7 +10,7 @@ =20 #include "hw/sysbus.h" #include "qom/object.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" =20 #define TYPE_ASPEED_INTC "aspeed.intc" #define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700" diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h index c92da2e2ac7..77551b9592e 100644 --- a/include/hw/m68k/q800.h +++ b/include/hw/m68k/q800.h @@ -31,7 +31,7 @@ #include "hw/misc/mac_via.h" #include "hw/net/dp8393x.h" #include "hw/char/escc.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/scsi/esp.h" #include "hw/block/swim.h" #include "hw/nubus/mac-nubus-bridge.h" diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index a0d917f9a9e..c262a9c6795 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -53,7 +53,7 @@ #include "hw/arm/boot.h" #include "hw/arm/armv7m.h" #include "hw/arm/machines-qom.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/core/boards.h" #include "system/address-spaces.h" #include "system/system.h" diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index bf5e07019ff..af3b0124891 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -32,7 +32,7 @@ #include "hw/arm/boot.h" #include "hw/arm/armv7m.h" #include "hw/arm/machines-qom.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/core/boards.h" #include "system/address-spaces.h" #include "system/system.h" diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index b63002f4835..c64e103f599 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -32,7 +32,7 @@ #include "cpu.h" #include "system/system.h" #include "hw/core/boards.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/arm/boot.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 9852e8f7648..100a9f59b3f 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -28,7 +28,7 @@ #include "hw/i2c/i2c.h" #include "hw/i2c/bitbang_i2c.h" #include "hw/core/irq.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/audio/wm8750.h" #include "system/block-backend.h" #include "system/runstate.h" diff --git a/hw/arm/stm32l4x5_soc.c b/hw/arm/stm32l4x5_soc.c index 64da5559c07..c28ce15e6bb 100644 --- a/hw/arm/stm32l4x5_soc.c +++ b/hw/arm/stm32l4x5_soc.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "system/address-spaces.h" #include "system/system.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/arm/stm32l4x5_soc.h" #include "hw/char/stm32l4x5_usart.h" #include "hw/gpio/stm32l4x5_gpio.h" diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 81cb6294cfa..a0b2f18b551 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -40,7 +40,7 @@ #include "hw/rtc/xlnx-zynqmp-rtc.h" #include "hw/misc/xlnx-versal-cfu.h" #include "hw/misc/xlnx-versal-cframe-reg.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/misc/xlnx-versal-crl.h" #include "hw/intc/arm_gicv3_common.h" #include "hw/intc/arm_gicv3_its_common.h" diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c index 61006672ad6..bcc7ad1e444 100644 --- a/hw/core/or-irq.c +++ b/hw/core/or-irq.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 4c03455d6bd..6fe030e8c5d 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -28,7 +28,7 @@ #include "system/system.h" #include "cpu.h" #include "hw/core/boards.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "elf.h" #include "hw/core/loader.h" #include "ui/console.h" diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index 3032e0d6854..a587f16131b 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -33,7 +33,7 @@ #include "hw/qdev-properties.h" #include "hw/intc/i8259.h" #include "hw/core/irq.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "qom/object.h" =20 #define TYPE_RAVEN_PCI_DEVICE "raven" diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c index 11bf406ef77..2de80a5fae9 100644 --- a/hw/ppc/pegasos.c +++ b/hw/ppc/pegasos.c @@ -14,7 +14,7 @@ #include "hw/sysbus.h" #include "hw/pci/pci_host.h" #include "hw/core/irq.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/pci-host/articia.h" #include "hw/pci-host/mv64361.h" #include "hw/isa/vt82c686.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index b6256864582..fa524513036 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -50,7 +50,7 @@ #include "hw/misc/empty_slot.h" #include "hw/misc/unimp.h" #include "hw/core/irq.h" -#include "hw/or-irq.h" +#include "hw/core/or-irq.h" #include "hw/core/loader.h" #include "elf.h" #include "trace.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764249647; cv=none; d=zohomail.com; s=zohoarc; b=IVTRredGAc97zaYjXCc7jdkqJp1u8X7YOUYlWp8SQWFWYDcJ08ZCT5DW4D3o+e6Sgnpv3enMdBav2UoW1sYluSFzo+n+14O8jdaNp+b1t3pmHTOGJrAJ/7yIqNO0gr04LJO+XlT5pi+dYxfVr+PnaKPoKtEYsB2OEvG7aYQa87w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764249647; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=rPn3s6GJ8euZXEVXy/H77NzWhVh7YdtKya5PhJ0IVoA=; b=TAeyg0b6btdSRZkL+6peq0ZxRqfawFDuwZ4s6mS9/yVbYswxcHzsw6JQ5R4a79N8D7+6pJBKjTZWfLaCGkBzEmb++of0vXK0cJ7fWiHwnT0dZZ7pzYBCKKwI7OiwDqY00Xq/k2tEX8ycbMKq9LAjzbEpNV+1M1D/XE/Lay4EURU= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764249647361555.3781737755947; Thu, 27 Nov 2025 05:20:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObt8-0005wQ-IM; Thu, 27 Nov 2025 08:18:22 -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 1vObqj-0002ed-Jb for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:56 -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 1vObqh-0001Gj-CJ for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:53 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-32-bYsKR0DbO36SC5Cs44izPA-1; Thu, 27 Nov 2025 08:15:49 -0500 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-b767784598dso63259066b.3 for ; Thu, 27 Nov 2025 05:15:47 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f59eb3f6sm154811066b.55.2025.11.27.05.15.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rPn3s6GJ8euZXEVXy/H77NzWhVh7YdtKya5PhJ0IVoA=; b=UH2DCTc56xZFFEhONtCPJ91Npx4iKP5rR/ScVq17KSDjqPdkTO+gH3sdr6+Ng7A+HSjTjQ 3+EYuFHGnVBRkAKe+QcUleVeCeslglky5pUbaWHhgXYOnzzVA/2maFd50Xdjul55SVX5kS NjZr5IMxwKn205Yp8K/RpLK/Oc0SEHw= X-MC-Unique: bYsKR0DbO36SC5Cs44izPA-1 X-Mimecast-MFC-AGG-ID: bYsKR0DbO36SC5Cs44izPA_1764249343 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249342; x=1764854142; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=rPn3s6GJ8euZXEVXy/H77NzWhVh7YdtKya5PhJ0IVoA=; b=W4HhvSJfZ86NXcnjNc5NI6EsiY9W5xPBKmoMa4X19ENzq0Fx8FXj+q6zpRdLlk1txJ E0FzsY7scjFp1S1iRdttYhzOb97J0Fhu02V0aV87Lely9fQdRjQGdiQ8wuHrv6ubO5qz Up9MqKgh5SW7gtf+WrPTI/TMDg2J/R8Jm/51P4+RLqL6KHzyq7dWGJ87V2ONi7hcLhaC lEozBKkqxTd/lqOibncF2spDuZrV2xcvHZ5TyuS2H22PbbdMktXeT4YtkpffwWjfEapF 0L4+8SVCmrMlawb8Y44UQAsftBLpFJmkRMn5nyuUDSwW+jf4G8JVR+EQYkzGQut6q7wF kNbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249342; x=1764854142; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=rPn3s6GJ8euZXEVXy/H77NzWhVh7YdtKya5PhJ0IVoA=; b=AlETIlOadCEybgTTjBJhEN7reNbeyLGpTFx/Lo58qVYd+3kI6qLM+kBd+fawtQMym6 /Bp9+bnz4aELmeLR/s+DNnPmGLyd8bnRBb4rDdFd4AZ3Prw12LcPV/0Q1k6upGLYuu9N ApP4oOaRzDZ5gujVh6+UBBXo6ImAdFqUgHxvcQGq/8lyNiMGGQOczsaxoq4zbjjhfbOz utIVyyRyhAYvTRYNHoRyWXP8jlg8wpxtbiKwkiwm9PqkBZNLANTfztEMSrB4yjkhRB2h RXPmTaAc8mHgYBf8vzHZFs6CvmLL89iAkk/qXpl5r/PP3BS7mx63xOfu7W+U6YK2mGXe Khsg== X-Gm-Message-State: AOJu0YzOSSgByGSg3DN1ysLSwSaU0kWCk2lqAawvM7u5Q29egzy51NUW MkASOJBVwlsHVf2WkpO8eJp7WdXlO0LcvZbdYbk7t+fwp5Qmh8Ng7tHEEeMrtWwWYL4kUICHcM2 /rjSJyUMPhNqFI4Kl/uwkRgd9G1x5//ziTyORGgkroqEESTKuujesDzkmst+wFcyc/kdESNGXzh 20OKRO/ilpCPTAdP/PL8UgiAHMkC+adlyLFVcXfhlA X-Gm-Gg: ASbGncvaDcqnd+57miKcyF05j/8vyx3l8GLaPy/C2JBorKACbnD/kCMfSyqbOVH2J2b EanjUTrJm59IQukcS0a1/N1u3QFT57PW1KjUd/jYBFz08C9i1Iu0A+21Si8+L3Hkx3mZPsCwGpR OFpT7xbJ+FWhpn4AkH7oASX/PSAhYOIcbE/KwdVTZK3Pxeve9zBqMcaGt0TOC85YmDaP/7SlfKW 4KxE6kVKUCYa3WCf+aIXJZdnbQILY4GVhPvk8FNu/azmEUSn5h0Owfz1SzOBnTLc6rmWYLunzd8 8qbGnuHOLNp3tW+QcxJsx8BpHU7mOnA51nbEl9JIJns2BAltornbDGfbLpXr7lyJtMc8Y4MGwtm K3INLlMGd0AEZkyidKrJHF93g12u6PsmZyBt/u+eq666Mv1qrJFTmgPu5gOqZb9D82eNAzOJOQT 2XJ+/Ko338/PP4i8I= X-Received: by 2002:a17:907:97d6:b0:b76:2d96:6c28 with SMTP id a640c23a62f3a-b76715acbd4mr2409933866b.24.1764249341688; Thu, 27 Nov 2025 05:15:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IGhiZxlursCvNaT6bq97EqynLxYV8JjekLOP/S09qU2IH1vHJyl0x583KHfB8adwD1gorEevw== X-Received: by 2002:a17:907:97d6:b0:b76:2d96:6c28 with SMTP id a640c23a62f3a-b76715acbd4mr2409930866b.24.1764249341160; Thu, 27 Nov 2025 05:15:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 14/28] include: move hw/platform-bus.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:01 +0100 Message-ID: <20251127131516.80807-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764249653962019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- hw/ppc/e500.h | 2 +- include/hw/{ =3D> core}/platform-bus.h | 0 hw/arm/virt-acpi-build.c | 2 +- hw/arm/virt.c | 2 +- hw/core/platform-bus.c | 2 +- hw/core/sysbus-fdt.c | 2 +- hw/loongarch/virt-acpi-build.c | 2 +- hw/loongarch/virt.c | 2 +- hw/ppc/e500.c | 2 +- hw/riscv/virt.c | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename include/hw/{ =3D> core}/platform-bus.h (100%) diff --git a/hw/ppc/e500.h b/hw/ppc/e500.h index cda539bda18..11f8ae53177 100644 --- a/hw/ppc/e500.h +++ b/hw/ppc/e500.h @@ -2,7 +2,7 @@ #define PPCE500_H =20 #include "hw/core/boards.h" -#include "hw/platform-bus.h" +#include "hw/core/platform-bus.h" #include "qom/object.h" =20 #define PLATFORM_CLK_FREQ_HZ (400 * 1000 * 1000) diff --git a/include/hw/platform-bus.h b/include/hw/core/platform-bus.h similarity index 100% rename from include/hw/platform-bus.h rename to include/hw/core/platform-bus.h diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 200e2a1da70..03b43425746 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -54,7 +54,7 @@ #include "hw/arm/virt.h" #include "hw/intc/arm_gicv3_its_common.h" #include "hw/mem/nvdimm.h" -#include "hw/platform-bus.h" +#include "hw/core/platform-bus.h" #include "system/numa.h" #include "system/reset.h" #include "system/tpm.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index c005eb914cb..0d2652e6dbc 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -62,7 +62,7 @@ #include "hw/pci-bridge/pci_expander_bridge.h" #include "hw/virtio/virtio-pci.h" #include "hw/core/sysbus-fdt.h" -#include "hw/platform-bus.h" +#include "hw/core/platform-bus.h" #include "hw/qdev-properties.h" #include "hw/arm/fdt.h" #include "hw/intc/arm_gic.h" diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c index 6950063de4f..4b6cc5f6498 100644 --- a/hw/core/platform-bus.c +++ b/hw/core/platform-bus.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/platform-bus.h" +#include "hw/core/platform-bus.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/core/sysbus-fdt.c b/hw/core/sysbus-fdt.c index 59f1d17de11..89d0c464454 100644 --- a/hw/core/sysbus-fdt.c +++ b/hw/core/sysbus-fdt.c @@ -32,7 +32,7 @@ #include "system/device_tree.h" #include "system/tpm.h" #include "hw/arm/smmuv3.h" -#include "hw/platform-bus.h" +#include "hw/core/platform-bus.h" #include "hw/display/ramfb.h" #include "hw/uefi/var-service-api.h" #include "hw/arm/fdt.h" diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c index 3694c9827f0..8ff9ebdcd9e 100644 --- a/hw/loongarch/virt-acpi-build.c +++ b/hw/loongarch/virt-acpi-build.c @@ -32,7 +32,7 @@ #include "hw/pci-host/gpex.h" #include "system/system.h" #include "system/tpm.h" -#include "hw/platform-bus.h" +#include "hw/core/platform-bus.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/hmat.h" =20 diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index ea53941aeb9..6efa15da473 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -37,7 +37,7 @@ #include "qapi/qapi-visit-common.h" #include "hw/acpi/generic_event_device.h" #include "hw/mem/nvdimm.h" -#include "hw/platform-bus.h" +#include "hw/core/platform-bus.h" #include "hw/display/ramfb.h" #include "hw/uefi/var-service-api.h" #include "hw/mem/pc-dimm.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 769f18023d5..7c65757e215 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -46,7 +46,7 @@ #include "qemu/option.h" #include "hw/pci-host/ppce500.h" #include "qemu/error-report.h" -#include "hw/platform-bus.h" +#include "hw/core/platform-bus.h" #include "hw/net/fsl_etsec/etsec.h" #include "hw/i2c/i2c.h" #include "hw/core/irq.h" diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 0505bffa44a..9cb4f16432e 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -43,7 +43,7 @@ #include "hw/intc/riscv_aplic.h" #include "hw/intc/sifive_plic.h" #include "hw/misc/sifive_test.h" -#include "hw/platform-bus.h" +#include "hw/core/platform-bus.h" #include "chardev/char.h" #include "system/device_tree.h" #include "system/system.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764249517; cv=none; d=zohomail.com; s=zohoarc; b=BArcBKTdg+ZkFmjNPP7v6PqG23gAVDqC4PsM8g2N1X2QsCB0bfxArNsmXkdWsyaGVSP54HCVH10fBQ6/xaOIx3YOWl1qS2QSaGoltBZEMCnishW3BeMkImdhogN2h3Z2q3pVvfXMAzoe4rKCZWJVu0pIfkSE2Gd515N8gxdmBXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764249517; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=t70U5AYdZhOQ6b5HQhJX00uZMDjfNxr8cwWQL7ALJ6s=; b=FOYpRcvfROweJIj8wP/xmgyZuFGFMb8QSa8fKqy3kQBtpRFTWbA6Qcgnnh/0DpQvOiRlvHUrOS7BDChJhwcksC1n6BdIXZpQ5nfAoCKbReJKkZSL02rnBstvaiHrUhc5i/676y2dNbBBLt4kidBKZZBYoBEX5x9Q3q01ltU++Ms= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764249514834644.0831438119708; Thu, 27 Nov 2025 05:18:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObsl-0004d3-Uv; Thu, 27 Nov 2025 08:18:00 -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 1vObqv-0002fV-IW for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:08 -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 1vObql-0001HQ-Lo for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:57 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-246-mh2-jUCtOJKqD1SaIo7Jjg-1; Thu, 27 Nov 2025 08:15:49 -0500 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-b7270cab7eeso89589166b.1 for ; Thu, 27 Nov 2025 05:15:49 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-64750a6ea36sm1533471a12.2.2025.11.27.05.15.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t70U5AYdZhOQ6b5HQhJX00uZMDjfNxr8cwWQL7ALJ6s=; b=J+k/xucy6sD6a3a2OhWjDj0fbnlrJKQXuAZvkCbj8M8TJsT8nrbb8/GaxpJxDHCSgpTgfr b+PumjWjYC8YADqmrE4NAAfH1/l8JiuABvLhcBskCs2LIh8xXyaRpXthXP9gc2fRWs/bmD 51o9y7wDkCfMHIgBqjBfRo79Ek50Q4s= X-MC-Unique: mh2-jUCtOJKqD1SaIo7Jjg-1 X-Mimecast-MFC-AGG-ID: mh2-jUCtOJKqD1SaIo7Jjg_1764249345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249345; x=1764854145; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=t70U5AYdZhOQ6b5HQhJX00uZMDjfNxr8cwWQL7ALJ6s=; b=K+kFPyLWdjM4XG/hyz2R0/DKewsBcUKZ5aC3K1LTgN0JLwWG+Lh7ralKT/EKh5RrPd gi4ms0X47u6iDOsEI/aDSogAxbUNIftGW9nbSr3WanMQUZxm389j9VU48MxyzysHFAaX wHLWKKsyy12W5oeKAzxDZ49rQC7CJTRdBWq9XSvNBhQqqlsjQe++LHM3zSpiildLqhBZ qCRTid5rfXGsxKKE2l3ipoi1kv7ZjRpVx/B4WyRbsANkb5IZxRR5LqH+Wn7KShb/pCFN w0Vd7OcKe8F/Cu1K4Qjsq7KfgJpuh1pSR7XfJx9j6BJ5M41TK5BTC5g3CizSyvMtMyF7 sIiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249345; x=1764854145; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=t70U5AYdZhOQ6b5HQhJX00uZMDjfNxr8cwWQL7ALJ6s=; b=EOs+ioHXm0f9x0cHZvoE2QY91KDc4Jsq1Adi4LYfIpZ/uMqqtqG7l4fmDm4+iJAgFA KdNL0pOXZkM03BaldBnMDwC+Kv9coCQnqvgR1wTvZLDKujpuYBbxxw1WpAqhwbNm2348 Cf277NSidMni2JsYs+npdfhqLEa07vXjiQvUaPdjQO2DUj4BPIJC5tTbJ4pyPEAXPbcH bm1xibxW1971UBbIEiMpMm7jHFuLZaCCj1/TAlGEt0JUpVgLHgEuqLkYS7+vEt0Pd8I0 sAJCvNtlq/bARWQuNLeJxKlgyxs0ViVc+ZfEkay5R4uvzfAMy5th+8HS8cUvaz3a5Irs pZpw== X-Gm-Message-State: AOJu0YyWqZjhe5yeBmLDOWYb2oQ/22boX7Ke0M4DrJLLuaO10sf1LwUg SMObGwvWHDU14T84qqpUh6fIPH5vpjE9It/MguzVHBu6xzQaRxTW6JmNt02KM8yYKRa/iargLPw 4PbO2qsgqOhOoIcfAvWGDc2/IVMq8CuDyeQzVvY5s5+Ny7UarnMg9xlCRwy7Va+OhVJDoX0TGh5 BkoIHmwzLMeGWx4KvYOvvZ3/I20qSiFs/7twY0rFyU X-Gm-Gg: ASbGnctsxTTu3fzTsPFe/4Ty2PXTD6PQd389ku+sABkiD2X3vedO2Ivh60zdRDmn403 jeqtBAmGX/YP/sNGNVYaoMRFsIxx/XDYC3uMcKvmWDKxWaWdApfOlgzksae6YIVoBjHGSQC0BR0 pC9YmUpbh7Oxa0eua5bJ0Nnk6YpM1Ocm7WRPqClwdQTfxvF/bD/ZH89SNjCTX+0oeJjjs4+d9Q2 QOfpO9epBXXK/pnMRjtgeUKYDXEy5y32ZQJ10TwQbAzW50HkDQboAYTzADwT7m4e5hBcqMv/Icd 1gOYmAuXtyt/58OwU5vq3zuCqy3koo/RqHtL87kU5VNd+VwbPU+sjcNXEo0VqlRFfTUMZEMzXZv IpQNCmVkeMP6pyZy4qASUh9uMPdTn4YA+RfaxMqROV14fvC7i1a5dn6sprojNYCRShGpwIYD1QN dEnDQQyr9YIIX6eGs= X-Received: by 2002:a17:906:cc48:b0:b76:e346:f74 with SMTP id a640c23a62f3a-b76e3461c89mr406131866b.16.1764249344522; Thu, 27 Nov 2025 05:15:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IEtqDpHLpMkF+NobHOjhOaXDMJ5WJLR5S5nTplmHdq+dMYsBqfLHfi8SLXHr3v3X83N48f8cA== X-Received: by 2002:a17:906:cc48:b0:b76:e346:f74 with SMTP id a640c23a62f3a-b76e3461c89mr406126166b.16.1764249343565; Thu, 27 Nov 2025 05:15:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 15/28] include: move hw/ptimer.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:02 +0100 Message-ID: <20251127131516.80807-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764249521561019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- hw/net/fsl_etsec/etsec.h | 2 +- include/hw/{ =3D> core}/ptimer.h | 0 include/hw/display/xlnx_dp.h | 2 +- include/hw/dma/xlnx_csu_dma.h | 2 +- include/hw/net/xlnx-versal-canfd.h | 2 +- include/hw/net/xlnx-zynqmp-can.h | 2 +- include/hw/timer/allwinner-a10-pit.h | 2 +- include/hw/timer/armv7m_systick.h | 2 +- include/hw/timer/cmsdk-apb-dualtimer.h | 2 +- include/hw/timer/cmsdk-apb-timer.h | 2 +- include/hw/timer/digic-timer.h | 2 +- include/hw/timer/imx_epit.h | 2 +- include/hw/timer/imx_gpt.h | 2 +- include/hw/timer/mss-timer.h | 2 +- include/hw/watchdog/allwinner-wdt.h | 2 +- include/hw/watchdog/cmsdk-apb-watchdog.h | 2 +- include/hw/watchdog/wdt_imx2.h | 2 +- hw/arm/musicpal.c | 2 +- hw/core/ptimer.c | 2 +- hw/dma/xilinx_axidma.c | 2 +- hw/dma/xlnx_csu_dma.c | 2 +- hw/m68k/mcf5206.c | 2 +- hw/m68k/mcf5208.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/net/lan9118.c | 2 +- hw/rtc/exynos4210_rtc.c | 2 +- hw/sparc/leon3.c | 2 +- hw/ssi/xilinx_spips.c | 2 +- hw/timer/arm_mptimer.c | 2 +- hw/timer/arm_timer.c | 2 +- hw/timer/digic-timer.c | 2 +- hw/timer/exynos4210_mct.c | 2 +- hw/timer/exynos4210_pwm.c | 2 +- hw/timer/grlib_gptimer.c | 2 +- hw/timer/sh_timer.c | 2 +- hw/timer/slavio_timer.c | 2 +- hw/timer/xilinx_timer.c | 2 +- tests/unit/ptimer-test.c | 2 +- 38 files changed, 37 insertions(+), 37 deletions(-) rename include/hw/{ =3D> core}/ptimer.h (100%) diff --git a/hw/net/fsl_etsec/etsec.h b/hw/net/fsl_etsec/etsec.h index bd2de3f99c7..ca8ad5638a3 100644 --- a/hw/net/fsl_etsec/etsec.h +++ b/hw/net/fsl_etsec/etsec.h @@ -27,7 +27,7 @@ =20 #include "hw/sysbus.h" #include "net/net.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "qom/object.h" =20 /* Buffer Descriptors */ diff --git a/include/hw/ptimer.h b/include/hw/core/ptimer.h similarity index 100% rename from include/hw/ptimer.h rename to include/hw/core/ptimer.h diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h index af859e477da..9ec5a90c342 100644 --- a/include/hw/display/xlnx_dp.h +++ b/include/hw/display/xlnx_dp.h @@ -35,7 +35,7 @@ #include "hw/dma/xlnx_dpdma.h" #include "qemu/audio.h" #include "qom/object.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" =20 #define AUD_CHBUF_MAX_DEPTH (32 * KiB) #define MAX_QEMU_BUFFER_SIZE (4 * KiB) diff --git a/include/hw/dma/xlnx_csu_dma.h b/include/hw/dma/xlnx_csu_dma.h index 922ab80eb61..85b6b64e0e3 100644 --- a/include/hw/dma/xlnx_csu_dma.h +++ b/include/hw/dma/xlnx_csu_dma.h @@ -23,7 +23,7 @@ =20 #include "hw/sysbus.h" #include "hw/register.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/stream.h" =20 #define TYPE_XLNX_CSU_DMA "xlnx.csu_dma" diff --git a/include/hw/net/xlnx-versal-canfd.h b/include/hw/net/xlnx-versa= l-canfd.h index 396f90d6dc1..d2e582918fb 100644 --- a/include/hw/net/xlnx-versal-canfd.h +++ b/include/hw/net/xlnx-versal-canfd.h @@ -29,7 +29,7 @@ #define HW_CANFD_XILINX_H =20 #include "hw/register.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "net/can_emu.h" #include "hw/qdev-clock.h" =20 diff --git a/include/hw/net/xlnx-zynqmp-can.h b/include/hw/net/xlnx-zynqmp-= can.h index fd2aa777603..8262f11d33d 100644 --- a/include/hw/net/xlnx-zynqmp-can.h +++ b/include/hw/net/xlnx-zynqmp-can.h @@ -35,7 +35,7 @@ #include "net/can_emu.h" #include "net/can_host.h" #include "qemu/fifo32.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/qdev-clock.h" =20 #define TYPE_XLNX_ZYNQMP_CAN "xlnx.zynqmp-can" diff --git a/include/hw/timer/allwinner-a10-pit.h b/include/hw/timer/allwin= ner-a10-pit.h index 8435758ad68..623a1fec219 100644 --- a/include/hw/timer/allwinner-a10-pit.h +++ b/include/hw/timer/allwinner-a10-pit.h @@ -1,7 +1,7 @@ #ifndef ALLWINNER_A10_PIT_H #define ALLWINNER_A10_PIT_H =20 -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/sysbus.h" #include "qom/object.h" =20 diff --git a/include/hw/timer/armv7m_systick.h b/include/hw/timer/armv7m_sy= stick.h index ac7de0a43ef..fb73f78a7b8 100644 --- a/include/hw/timer/armv7m_systick.h +++ b/include/hw/timer/armv7m_systick.h @@ -14,7 +14,7 @@ =20 #include "hw/sysbus.h" #include "qom/object.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/core/clock.h" =20 #define TYPE_SYSTICK "armv7m_systick" diff --git a/include/hw/timer/cmsdk-apb-dualtimer.h b/include/hw/timer/cmsd= k-apb-dualtimer.h index f098128a588..103ac228815 100644 --- a/include/hw/timer/cmsdk-apb-dualtimer.h +++ b/include/hw/timer/cmsdk-apb-dualtimer.h @@ -27,7 +27,7 @@ #define CMSDK_APB_DUALTIMER_H =20 #include "hw/sysbus.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/core/clock.h" #include "qom/object.h" =20 diff --git a/include/hw/timer/cmsdk-apb-timer.h b/include/hw/timer/cmsdk-ap= b-timer.h index 74eaf611aeb..f8c8fb8ce55 100644 --- a/include/hw/timer/cmsdk-apb-timer.h +++ b/include/hw/timer/cmsdk-apb-timer.h @@ -13,7 +13,7 @@ #define CMSDK_APB_TIMER_H =20 #include "hw/sysbus.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/core/clock.h" #include "qom/object.h" =20 diff --git a/include/hw/timer/digic-timer.h b/include/hw/timer/digic-timer.h index da82fb46637..f62242eaad3 100644 --- a/include/hw/timer/digic-timer.h +++ b/include/hw/timer/digic-timer.h @@ -19,7 +19,7 @@ #define HW_TIMER_DIGIC_TIMER_H =20 #include "hw/sysbus.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "qom/object.h" =20 #define TYPE_DIGIC_TIMER "digic-timer" diff --git a/include/hw/timer/imx_epit.h b/include/hw/timer/imx_epit.h index 79aff0cec20..2947fad1069 100644 --- a/include/hw/timer/imx_epit.h +++ b/include/hw/timer/imx_epit.h @@ -30,7 +30,7 @@ #define IMX_EPIT_H =20 #include "hw/sysbus.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/misc/imx_ccm.h" #include "qom/object.h" =20 diff --git a/include/hw/timer/imx_gpt.h b/include/hw/timer/imx_gpt.h index 5488f7e4df5..5c12f686e1b 100644 --- a/include/hw/timer/imx_gpt.h +++ b/include/hw/timer/imx_gpt.h @@ -30,7 +30,7 @@ #define IMX_GPT_H =20 #include "hw/sysbus.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/misc/imx_ccm.h" #include "qom/object.h" =20 diff --git a/include/hw/timer/mss-timer.h b/include/hw/timer/mss-timer.h index da38512904e..0cc376f945f 100644 --- a/include/hw/timer/mss-timer.h +++ b/include/hw/timer/mss-timer.h @@ -26,7 +26,7 @@ #define HW_MSS_TIMER_H =20 #include "hw/sysbus.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "qom/object.h" =20 #define TYPE_MSS_TIMER "mss-timer" diff --git a/include/hw/watchdog/allwinner-wdt.h b/include/hw/watchdog/allw= inner-wdt.h index 7fe41e20f2e..6f84dbd1a72 100644 --- a/include/hw/watchdog/allwinner-wdt.h +++ b/include/hw/watchdog/allwinner-wdt.h @@ -24,7 +24,7 @@ #define HW_WATCHDOG_ALLWINNER_WDT_H =20 #include "qom/object.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/sysbus.h" =20 /* diff --git a/include/hw/watchdog/cmsdk-apb-watchdog.h b/include/hw/watchdog= /cmsdk-apb-watchdog.h index 5bbf4979c9f..9bf95ba06d5 100644 --- a/include/hw/watchdog/cmsdk-apb-watchdog.h +++ b/include/hw/watchdog/cmsdk-apb-watchdog.h @@ -32,7 +32,7 @@ #define CMSDK_APB_WATCHDOG_H =20 #include "hw/sysbus.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/core/clock.h" #include "qom/object.h" =20 diff --git a/include/hw/watchdog/wdt_imx2.h b/include/hw/watchdog/wdt_imx2.h index ddc49aaea4f..53a8360e906 100644 --- a/include/hw/watchdog/wdt_imx2.h +++ b/include/hw/watchdog/wdt_imx2.h @@ -15,7 +15,7 @@ #include "qemu/bitops.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "qom/object.h" =20 #define TYPE_IMX2_WDT "imx2.wdt" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 100a9f59b3f..a4ddc0d08f9 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -21,7 +21,7 @@ #include "hw/core/boards.h" #include "hw/char/serial-mm.h" #include "qemu/timer.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/qdev-properties.h" #include "hw/block/flash.h" #include "ui/console.h" diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index a7337f02b8d..e42e06fa4de 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -7,7 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "migration/vmstate.h" #include "qemu/host-utils.h" #include "exec/replay-core.h" diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 9b05080ae59..15da3fcbc2c 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -28,7 +28,7 @@ #include "qemu/timer.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c index 0b1185325ba..92f445034e8 100644 --- a/hw/dma/xlnx_csu_dma.c +++ b/hw/dma/xlnx_csu_dma.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "system/dma.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/stream.h" #include "hw/register.h" #include "hw/dma/xlnx_csu_dma.h" diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index 4cf86d510b3..e17da4fd209 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -15,7 +15,7 @@ #include "hw/core/irq.h" #include "hw/m68k/mcf.h" #include "qemu/timer.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "system/system.h" #include "hw/sysbus.h" =20 diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index b81305ae6e4..3a87e1f282c 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -25,7 +25,7 @@ #include "hw/m68k/mcf.h" #include "hw/m68k/mcf_fec.h" #include "qemu/timer.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "system/system.h" #include "system/qtest.h" #include "net/net.h" diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 6ae8a1e1a3c..e6a29d9ec6d 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -30,7 +30,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/net/mii.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/qdev-properties.h" #include "etsec.h" #include "registers.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index 1c9bb4807d2..191fd8b421b 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -18,7 +18,7 @@ #include "hw/core/irq.h" #include "hw/net/lan9118_phy.h" #include "hw/net/lan9118.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/bswap.h" diff --git a/hw/rtc/exynos4210_rtc.c b/hw/rtc/exynos4210_rtc.c index a7e17031ca8..a15b5274bd3 100644 --- a/hw/rtc/exynos4210_rtc.c +++ b/hw/rtc/exynos4210_rtc.c @@ -32,7 +32,7 @@ #include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/bcd.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" =20 #include "hw/core/irq.h" =20 diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index cd1a03a5584..50f1cf91706 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -32,7 +32,7 @@ #include "cpu.h" #include "hw/core/irq.h" #include "qemu/timer.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/qdev-properties.h" #include "system/system.h" #include "system/qtest.h" diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index b2f66275182..5fa9bf965ff 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index ac6313039a8..adec87cc8d2 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/qdev-properties.h" #include "hw/timer/arm_mptimer.h" #include "migration/vmstate.h" diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index e5ef28de6f7..8d8b250698c 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -12,7 +12,7 @@ #include "migration/vmstate.h" #include "qemu/timer.h" #include "hw/core/irq.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/qdev-properties.h" #include "qemu/module.h" #include "qemu/log.h" diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c index 355138d3547..12b79914df0 100644 --- a/hw/timer/digic-timer.c +++ b/hw/timer/digic-timer.c @@ -28,7 +28,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "qemu/module.h" #include "qemu/log.h" =20 diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index 06524efca27..f6527a451b6 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -58,7 +58,7 @@ #include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/module.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" =20 #include "hw/arm/exynos4210.h" #include "hw/core/irq.h" diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c index dc76932fdfb..1643fa39418 100644 --- a/hw/timer/exynos4210_pwm.c +++ b/hw/timer/exynos4210_pwm.c @@ -26,7 +26,7 @@ #include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/module.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" =20 #include "hw/arm/exynos4210.h" #include "hw/core/irq.h" diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 6218c255d2c..82d0d9d7622 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -29,7 +29,7 @@ #include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/core/irq.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/qdev-properties.h" #include "qemu/module.h" =20 diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c index adc05715528..41ece9c6136 100644 --- a/hw/timer/sh_timer.c +++ b/hw/timer/sh_timer.c @@ -14,7 +14,7 @@ #include "hw/core/irq.h" #include "hw/sh4/sh.h" #include "hw/timer/tmu012.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "trace.h" =20 #define TIMER_TCR_TPSC (7 << 0) diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 5bf94157ca4..f66b3aaa433 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/timer.h" #include "hw/core/irq.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index c1b6d2bdf2d..fbc10015916 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -29,7 +29,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/log.h" diff --git a/tests/unit/ptimer-test.c b/tests/unit/ptimer-test.c index 08240594bbd..6de658812b1 100644 --- a/tests/unit/ptimer-test.c +++ b/tests/unit/ptimer-test.c @@ -12,7 +12,7 @@ #include =20 #include "qemu/main-loop.h" -#include "hw/ptimer.h" +#include "hw/core/ptimer.h" =20 #include "ptimer-test.h" =20 --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764250698; cv=none; d=zohomail.com; s=zohoarc; b=acuDzZcFfmO9spGZURv3BzK4wxTxwsADgKL0RojcDMAVA0GrVegLJOtTZwBS/FD4+sc9NN0Jgl3s/U/rXTAv9x2uFByaCq6aw8RmhQzni/+UdXB5fEogoIjkxMFrZemJskxpFVls8q/p/q1YGPfcsuZwfRIKFamnGjAE2MAp8Sk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764250698; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=W4s//t0LDdu7wkY5l5bRY2BtbTraYItxOYoXtY2qupM=; b=VclOC8nXD4aFlMm6ra1W5UqjbC0fKG8cOEqewLwpOTWd+ecOcKWn/XM3yWPJZWrz06UCBBJ0GIAuoVjM/nZ5B3lkHe/x+p9wQowiStnqUDtSi+t+uao9uEN3Jap6DFeIsLnW8z5y9Q4guBJe2isrivFeM2e2TPAUJZ6U3oHfO58= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764250698315774.3481473789094; Thu, 27 Nov 2025 05:38:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObtC-000695-Gp; Thu, 27 Nov 2025 08:18:26 -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 1vObqj-0002ee-KT for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:56 -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 1vObqg-0001GT-2m for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:53 -0500 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-516-sHAM2baUOB-bs8A4btj6xg-1; Thu, 27 Nov 2025 08:15:47 -0500 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-6417677bf55so2847344a12.1 for ; Thu, 27 Nov 2025 05:15:47 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-64750a90d45sm1559510a12.8.2025.11.27.05.15.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W4s//t0LDdu7wkY5l5bRY2BtbTraYItxOYoXtY2qupM=; b=ND16NkAs7dRI2ydu1psfS2k+al+N9JFQfJjXoiUMbE3AlIAL49o5suqaQra5/IjV+mEE0S nsHEi6UQ2xphWREHc8vnLPYNnEnx4bUuaHcqOTkA5uKk/RlbON7iTrcYF4lSSBxysUWsdR +i64YaYiD1QG/gdEA9WuyFRXr89BH7c= X-MC-Unique: sHAM2baUOB-bs8A4btj6xg-1 X-Mimecast-MFC-AGG-ID: sHAM2baUOB-bs8A4btj6xg_1764249347 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249346; x=1764854146; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=W4s//t0LDdu7wkY5l5bRY2BtbTraYItxOYoXtY2qupM=; b=a9JdQWJCVq1Y1v6mNxO8Ymic6jUIdypkqdD0iVaZcKYvGvWNj7beZ8xnatJeTpwFIg GODarYYRl78Bkdcf80I8ZNb1LMwrLCqjrsUnIRwfLSyUR5yPpsKr62DrdaVSc0BUZnsd mcCSUIM/ikJ3ZZ47RMP6OQHSJc8KjrrTBJ4efOr/sfxDkccm84Vv1zfBHXVqfE5elPd/ lSRaEQjI8XCinVTcEcytwpvH24iIbdbiVft9eenvS5uZTlF6YlvNSMigNZf1WV8oPdYQ iWsX/MFzdj3c/FCItufRUXunm4Hn7bYe30Pcme2md3wCtzePG6ArNh8qfm8HuHAk9j+V 3YIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249346; x=1764854146; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=W4s//t0LDdu7wkY5l5bRY2BtbTraYItxOYoXtY2qupM=; b=BJs/ILZADDUBClneFlAfrlDOanYo5Se818L4OiC37qiFaXN0IKB36AfuimzJw8rlNl dpbu/oPNyrP5ohxbR21QD8DmpL3yGt49TysylldO/a2GnbPPA6ajaCErmkv4VZUYfsnf 3m1vrrrnY7aHlIcAw2FaYQOO9ZKkr3TiA83hFOdweD2rh4TIOeigbuH5NrXefslCP3f4 +WMwTevoohNSCR8Qw6gcrLB/p955CWTfGBN03c3ckLgMFd0tyoB03cyXWhec+cgU7wy8 KRdAgfx5MUvGWO/sx06gpBVV43hdprVUidVuWIWafvAjqQ0ImX142ArMf1bE1cUmvGOJ WAFw== X-Gm-Message-State: AOJu0YxeziQA+DNQFmexLotoGFH4AtBBd4mqYo5J3Xy0qCgMHNUq4paT ao7n4DiGh3xb9GoEN6h3kekv+Wt+W8h3lsCukp5eOwPOAEr7hzVyTHkagzZYMawMlzded+CPcM/ YAf4ncxnG2M6SQBuXEPafBFIEQpFWdKfDoBLJpWMg+1zK2jAYjeGfu7vcp8zPNnvdAfUvgVWEIW 9ekON1L1HnQv3+OpFggqjPeKYoB74YiQxJ/PfcewnF X-Gm-Gg: ASbGncthY5gUgihJ6jF1AbrENsJ/1LfRhSEaLBgdmu64QUsHLyXGeQGgbRwvUn7xqkN DS8eUL9GiPenp5YQHs0Tn82b0KIidEGwG0+9Gg8FOAfCGkUETE3N+LSlv7Qo78t83Wz1+j/gkkG /HAWhVxurUvfGdg2jsrKOEDk8Kbp4RcmbdtgbveOwF1lLNUAmqdbS4xajzPe0KFU6PX/dgENCXH P/SSsEDtJRlqN2UaobrIETq6X/oOKzFt2QdEWqSLA0cM1d/y/q2u21HsdUaZLh2SflUPjRYi9mn 3ACA/ICJ4st6hPVJXLFpRhqt4YmP6z6rXk5dgTc0JwY6P/8mwlTTR1/+v2TYKWfYSTPiu9HkV1h bQRU2fb0DpPfHpm+N/K/8VYREC5+HZmQUXe3lecJSnrm3GDeKsYtJHS+A6yoaakeRcapVoi5s+r dq0YUGuiTBdpAQH7c= X-Received: by 2002:a05:6402:1641:b0:641:5a05:c72f with SMTP id 4fb4d7f45d1cf-645396af1f3mr19311246a12.16.1764249345782; Thu, 27 Nov 2025 05:15:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IHGgJk7NT2J01Gx/CPcYlmX4D1gh3MsjyuaknaKi5/uStYNxqATHBiZLUaqQ8ssbP37YEqF7g== X-Received: by 2002:a05:6402:1641:b0:641:5a05:c72f with SMTP id 4fb4d7f45d1cf-645396af1f3mr19311180a12.16.1764249344835; Thu, 27 Nov 2025 05:15:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 16/28] include: move hw/qdev-clock.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:03 +0100 Message-ID: <20251127131516.80807-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764250701325019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- MAINTAINERS | 2 +- docs/devel/clocks.rst | 4 ++-- include/hw/{ =3D> core}/qdev-clock.h | 0 include/hw/misc/bcm2835_cprman.h | 2 +- include/hw/net/xlnx-versal-canfd.h | 2 +- include/hw/net/xlnx-zynqmp-can.h | 2 +- rust/hw/core/wrapper.h | 2 +- hw/adc/npcm7xx_adc.c | 2 +- hw/arm/armsse.c | 2 +- hw/arm/armv7m.c | 2 +- hw/arm/aspeed.c | 2 +- hw/arm/aspeed_ast10x0.c | 2 +- hw/arm/aspeed_ast10x0_evb.c | 2 +- hw/arm/aspeed_ast27x0-fc.c | 2 +- hw/arm/aspeed_ast27x0-ssp.c | 2 +- hw/arm/aspeed_ast27x0-tsp.c | 2 +- hw/arm/fby35.c | 2 +- hw/arm/max78000_soc.c | 2 +- hw/arm/max78000fthr.c | 2 +- hw/arm/mps2-tz.c | 2 +- hw/arm/mps2.c | 2 +- hw/arm/mps3r.c | 2 +- hw/arm/msf2-soc.c | 2 +- hw/arm/msf2-som.c | 2 +- hw/arm/musca.c | 2 +- hw/arm/netduino2.c | 2 +- hw/arm/netduinoplus2.c | 2 +- hw/arm/npcm7xx.c | 2 +- hw/arm/npcm8xx.c | 2 +- hw/arm/nrf51_soc.c | 2 +- hw/arm/olimex-stm32-h405.c | 2 +- hw/arm/stellaris.c | 2 +- hw/arm/stm32f100_soc.c | 2 +- hw/arm/stm32f205_soc.c | 2 +- hw/arm/stm32f405_soc.c | 2 +- hw/arm/stm32l4x5_soc.c | 2 +- hw/arm/stm32vldiscovery.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/char/cadence_uart.c | 2 +- hw/char/ibex_uart.c | 2 +- hw/char/pl011.c | 2 +- hw/char/stm32l4x5_usart.c | 2 +- hw/core/qdev-clock.c | 2 +- hw/core/qdev.c | 2 +- hw/gpio/stm32l4x5_gpio.c | 2 +- hw/mips/boston.c | 2 +- hw/mips/cps.c | 2 +- hw/mips/malta.c | 2 +- hw/misc/npcm7xx_mft.c | 2 +- hw/misc/npcm7xx_pwm.c | 2 +- hw/misc/npcm_clk.c | 2 +- hw/misc/stm32l4x5_rcc.c | 2 +- hw/misc/stm32l4x5_syscfg.c | 2 +- hw/misc/zynq_slcr.c | 2 +- hw/net/npcm7xx_emc.c | 2 +- hw/timer/armv7m_systick.c | 2 +- hw/timer/cmsdk-apb-dualtimer.c | 2 +- hw/timer/cmsdk-apb-timer.c | 2 +- hw/timer/npcm7xx_timer.c | 2 +- hw/timer/sse-counter.c | 2 +- hw/timer/sse-timer.c | 2 +- hw/timer/stellaris-gptm.c | 2 +- hw/watchdog/cmsdk-apb-watchdog.c | 2 +- target/mips/cpu.c | 2 +- target/xtensa/cpu.c | 2 +- 65 files changed, 65 insertions(+), 65 deletions(-) rename include/hw/{ =3D> core}/qdev-clock.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index c464e7b5ea8..f6e9ad535fa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3952,7 +3952,7 @@ M: Luc Michel R: Damien Hedde S: Maintained F: include/hw/core/clock.h -F: include/hw/qdev-clock.h +F: include/hw/core/qdev-clock.h F: hw/core/clock.c F: hw/core/clock-vmstate.c F: hw/core/qdev-clock.c diff --git a/docs/devel/clocks.rst b/docs/devel/clocks.rst index 2dbdc668606..16de32147b9 100644 --- a/docs/devel/clocks.rst +++ b/docs/devel/clocks.rst @@ -47,7 +47,7 @@ Here is an example of clocks:: +--------------+ =20 Clocks are defined in the ``include/hw/core/clock.h`` header and device -related functions are defined in the ``include/hw/qdev-clock.h`` +related functions are defined in the ``include/hw/core/qdev-clock.h`` header. =20 The clock state @@ -97,7 +97,7 @@ Note that it is possible to create a static array describ= ing clock inputs and outputs. The function ``qdev_init_clocks()`` must be called with the array= as parameter to initialize the clocks: it has the same behaviour as calling t= he ``qdev_init_clock_in/out()`` for each clock in the array. To ease the array -construction, some macros are defined in ``include/hw/qdev-clock.h``. +construction, some macros are defined in ``include/hw/core/qdev-clock.h``. As an example, the following creates 2 clocks to a device: one input and o= ne output. =20 diff --git a/include/hw/qdev-clock.h b/include/hw/core/qdev-clock.h similarity index 100% rename from include/hw/qdev-clock.h rename to include/hw/core/qdev-clock.h diff --git a/include/hw/misc/bcm2835_cprman.h b/include/hw/misc/bcm2835_cpr= man.h index 0d380367280..7b2c0a54642 100644 --- a/include/hw/misc/bcm2835_cprman.h +++ b/include/hw/misc/bcm2835_cprman.h @@ -10,7 +10,7 @@ #define HW_MISC_BCM2835_CPRMAN_H =20 #include "hw/sysbus.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" =20 #define TYPE_BCM2835_CPRMAN "bcm2835-cprman" =20 diff --git a/include/hw/net/xlnx-versal-canfd.h b/include/hw/net/xlnx-versa= l-canfd.h index d2e582918fb..45cf0001c6b 100644 --- a/include/hw/net/xlnx-versal-canfd.h +++ b/include/hw/net/xlnx-versal-canfd.h @@ -31,7 +31,7 @@ #include "hw/register.h" #include "hw/core/ptimer.h" #include "net/can_emu.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" =20 #define TYPE_XILINX_CANFD "xlnx.versal-canfd" =20 diff --git a/include/hw/net/xlnx-zynqmp-can.h b/include/hw/net/xlnx-zynqmp-= can.h index 8262f11d33d..d272f40ea80 100644 --- a/include/hw/net/xlnx-zynqmp-can.h +++ b/include/hw/net/xlnx-zynqmp-can.h @@ -36,7 +36,7 @@ #include "net/can_host.h" #include "qemu/fifo32.h" #include "hw/core/ptimer.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" =20 #define TYPE_XLNX_ZYNQMP_CAN "xlnx.zynqmp-can" =20 diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h index e5c7e0518a5..44f8583bff9 100644 --- a/rust/hw/core/wrapper.h +++ b/rust/hw/core/wrapper.h @@ -26,7 +26,7 @@ typedef enum memory_order { =20 #include "hw/sysbus.h" #include "hw/core/clock.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/core/irq.h" diff --git a/hw/adc/npcm7xx_adc.c b/hw/adc/npcm7xx_adc.c index ddb219d4562..4494d5558f0 100644 --- a/hw/adc/npcm7xx_adc.c +++ b/hw/adc/npcm7xx_adc.c @@ -16,7 +16,7 @@ =20 #include "qemu/osdep.h" #include "hw/adc/npcm7xx_adc.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/registerfields.h" #include "migration/vmstate.h" diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index c0d99182bf9..42ceb097ae8 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -23,7 +23,7 @@ #include "hw/arm/armsse-version.h" #include "hw/arm/boot.h" #include "hw/core/irq.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" =20 /* * The SSE-300 puts some devices in different places to the diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 8198a83d15c..d9c7bcbcd71 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -14,7 +14,7 @@ #include "hw/arm/boot.h" #include "hw/core/loader.h" #include "hw/qdev-properties.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "elf.h" #include "system/reset.h" #include "qemu/error-report.h" diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 3a5071a3841..6199d2d2d7c 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -21,7 +21,7 @@ #include "system/block-backend.h" #include "qemu/error-report.h" #include "qemu/units.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "system/system.h" =20 static struct arm_boot_info aspeed_board_binfo =3D { diff --git a/hw/arm/aspeed_ast10x0.c b/hw/arm/aspeed_ast10x0.c index ca487774aee..f923b9505b7 100644 --- a/hw/arm/aspeed_ast10x0.c +++ b/hw/arm/aspeed_ast10x0.c @@ -13,7 +13,7 @@ #include "qapi/error.h" #include "system/address-spaces.h" #include "system/system.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" #include "hw/arm/aspeed_soc.h" =20 diff --git a/hw/arm/aspeed_ast10x0_evb.c b/hw/arm/aspeed_ast10x0_evb.c index 7af2a77865e..329578a542c 100644 --- a/hw/arm/aspeed_ast10x0_evb.c +++ b/hw/arm/aspeed_ast10x0_evb.c @@ -12,7 +12,7 @@ #include "hw/arm/machines-qom.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "system/system.h" #include "hw/i2c/smbus_eeprom.h" =20 diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c index 1678cce416b..0502a137f3d 100644 --- a/hw/arm/aspeed_ast27x0-fc.c +++ b/hw/arm/aspeed_ast27x0-fc.c @@ -16,7 +16,7 @@ #include "system/system.h" #include "hw/arm/aspeed.h" #include "hw/core/boards.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/arm/aspeed_soc.h" #include "hw/core/loader.h" #include "hw/arm/boot.h" diff --git a/hw/arm/aspeed_ast27x0-ssp.c b/hw/arm/aspeed_ast27x0-ssp.c index d12a9b8459c..04d37056596 100644 --- a/hw/arm/aspeed_ast27x0-ssp.c +++ b/hw/arm/aspeed_ast27x0-ssp.c @@ -11,7 +11,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" #include "hw/arm/aspeed_soc.h" #include "hw/arm/aspeed_coprocessor.h" diff --git a/hw/arm/aspeed_ast27x0-tsp.c b/hw/arm/aspeed_ast27x0-tsp.c index 5b75e142063..f40c70fea54 100644 --- a/hw/arm/aspeed_ast27x0-tsp.c +++ b/hw/arm/aspeed_ast27x0-tsp.c @@ -11,7 +11,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" #include "hw/arm/aspeed_soc.h" #include "hw/arm/aspeed_coprocessor.h" diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c index 9d976c3d142..c91b41a7fc5 100644 --- a/hw/arm/fby35.c +++ b/hw/arm/fby35.c @@ -11,7 +11,7 @@ #include "system/system.h" #include "system/block-backend.h" #include "hw/core/boards.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/arm/aspeed_soc.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/max78000_soc.c b/hw/arm/max78000_soc.c index 7f1856f5ba1..321e63723e3 100644 --- a/hw/arm/max78000_soc.c +++ b/hw/arm/max78000_soc.c @@ -14,7 +14,7 @@ #include "system/address-spaces.h" #include "system/system.h" #include "hw/arm/max78000_soc.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" =20 static const uint32_t max78000_icc_addr[] =3D {0x4002a000, 0x4002a800}; diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c index e4ceb7efcd5..4b6e76e46bb 100644 --- a/hw/arm/max78000fthr.c +++ b/hw/arm/max78000fthr.c @@ -10,7 +10,7 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/qdev-properties.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/max78000_soc.h" #include "hw/arm/boot.h" diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index c262a9c6795..f101c1b7c3b 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -73,7 +73,7 @@ #include "hw/net/lan9118.h" #include "net/net.h" #include "hw/core/split-irq.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "qom/object.h" #include "hw/core/irq.h" =20 diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index af3b0124891..7d2efc703bd 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -48,7 +48,7 @@ #include "hw/net/lan9118.h" #include "net/net.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "qobject/qlist.h" #include "qom/object.h" =20 diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index c64e103f599..77a0c0b7aff 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -33,7 +33,7 @@ #include "system/system.h" #include "hw/core/boards.h" #include "hw/core/or-irq.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/bsa.h" diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index c5e9c7175a4..27d77af9dcd 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -29,7 +29,7 @@ #include "hw/char/serial-mm.h" #include "hw/arm/msf2-soc.h" #include "hw/misc/unimp.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "system/system.h" =20 #define MSF2_TIMER_BASE 0x40004000 diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 78d98c4a407..10382f0d3b2 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -33,7 +33,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "system/address-spaces.h" #include "hw/arm/msf2-soc.h" =20 diff --git a/hw/arm/musca.c b/hw/arm/musca.c index 7b30d9bd446..75d82eebcac 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -34,7 +34,7 @@ #include "hw/misc/tz-ppc.h" #include "hw/misc/unimp.h" #include "hw/rtc/pl031.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "qom/object.h" =20 #define MUSCA_NUMIRQ_MAX 96 diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index 1657612fe77..c9281059365 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/qdev-properties.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/stm32f205_soc.h" #include "hw/arm/boot.h" diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index 746a3deef8e..d64d2aefe46 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/qdev-properties.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/stm32f405_soc.h" #include "hw/arm/boot.h" diff --git a/hw/arm/npcm7xx.c b/hw/arm/npcm7xx.c index 6d6f6744869..6905e1d8a7d 100644 --- a/hw/arm/npcm7xx.c +++ b/hw/arm/npcm7xx.c @@ -21,7 +21,7 @@ #include "hw/char/serial-mm.h" #include "hw/core/loader.h" #include "hw/misc/unimp.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "exec/tswap.h" diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c index 2bf5e132bb5..71e47dac2e1 100644 --- a/hw/arm/npcm8xx.c +++ b/hw/arm/npcm8xx.c @@ -24,7 +24,7 @@ #include "hw/intc/arm_gic.h" #include "hw/core/loader.h" #include "hw/misc/unimp.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/units.h" diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index d8cc3214ed6..a4ccfa373a6 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -12,7 +12,7 @@ #include "qapi/error.h" #include "hw/arm/boot.h" #include "hw/sysbus.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" #include "qemu/log.h" =20 diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c index d15545ff07a..1a08d742155 100644 --- a/hw/arm/olimex-stm32-h405.c +++ b/hw/arm/olimex-stm32-h405.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/qdev-properties.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/stm32f405_soc.h" #include "hw/arm/boot.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 34cbcbe32c2..f3e8e15de81 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -31,7 +31,7 @@ #include "migration/vmstate.h" #include "hw/misc/unimp.h" #include "hw/timer/stellaris-gptm.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "qom/object.h" #include "qobject/qlist.h" #include "ui/input.h" diff --git a/hw/arm/stm32f100_soc.c b/hw/arm/stm32f100_soc.c index 0702d51cc3e..8d61be72c48 100644 --- a/hw/arm/stm32f100_soc.c +++ b/hw/arm/stm32f100_soc.c @@ -30,7 +30,7 @@ #include "system/address-spaces.h" #include "hw/arm/stm32f100_soc.h" #include "hw/qdev-properties.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" #include "system/system.h" =20 diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index e3c7203c6e7..406f614f1d5 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -29,7 +29,7 @@ #include "system/address-spaces.h" #include "hw/arm/stm32f205_soc.h" #include "hw/qdev-properties.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "system/system.h" =20 /* At the moment only Timer 2 to 5 are modelled */ diff --git a/hw/arm/stm32f405_soc.c b/hw/arm/stm32f405_soc.c index c8684e2b4c5..c2bc460603f 100644 --- a/hw/arm/stm32f405_soc.c +++ b/hw/arm/stm32f405_soc.c @@ -27,7 +27,7 @@ #include "system/address-spaces.h" #include "system/system.h" #include "hw/arm/stm32f405_soc.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" =20 #define RCC_ADDR 0x40023800 diff --git a/hw/arm/stm32l4x5_soc.c b/hw/arm/stm32l4x5_soc.c index c28ce15e6bb..39b8cdf97dc 100644 --- a/hw/arm/stm32l4x5_soc.c +++ b/hw/arm/stm32l4x5_soc.c @@ -30,7 +30,7 @@ #include "hw/arm/stm32l4x5_soc.h" #include "hw/char/stm32l4x5_usart.h" #include "hw/gpio/stm32l4x5_gpio.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" =20 #define FLASH_BASE_ADDRESS 0x08000000 diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index 4843c5565b6..e7e1b8200e1 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/qdev-properties.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/stm32f100_soc.h" #include "hw/arm/boot.h" diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index e127b232d75..0d9c01e4b78 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -34,7 +34,7 @@ #include "hw/char/cadence_uart.h" #include "hw/net/cadence_gem.h" #include "hw/cpu/a9mpcore.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" #include "system/reset.h" #include "qom/object.h" diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index 738ba3114b9..58c4c95fded 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -31,7 +31,7 @@ #include "qemu/module.h" #include "hw/char/cadence_uart.h" #include "hw/core/irq.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties-system.h" #include "trace.h" =20 diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c index db852511091..23abeacb1b5 100644 --- a/hw/char/ibex_uart.c +++ b/hw/char/ibex_uart.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "hw/char/ibex_uart.h" #include "hw/core/irq.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/registerfields.h" diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 75fdb8158e4..030d6a2e8b4 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -23,7 +23,7 @@ #include "hw/char/pl011.h" #include "hw/core/irq.h" #include "hw/sysbus.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c index ce4a35da8f4..4533cbc93be 100644 --- a/hw/char/stm32l4x5_usart.c +++ b/hw/char/stm32l4x5_usart.c @@ -25,7 +25,7 @@ #include "hw/char/stm32l4x5_usart.h" #include "hw/core/clock.h" #include "hw/core/irq.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/registerfields.h" diff --git a/hw/core/qdev-clock.c b/hw/core/qdev-clock.c index dacafa4e036..b96525951cd 100644 --- a/hw/core/qdev-clock.c +++ b/hw/core/qdev-clock.c @@ -13,7 +13,7 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-core.h" #include "qapi/error.h" =20 diff --git a/hw/core/qdev.c b/hw/core/qdev.c index f9f56c66aec..fae9ffc7595 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -36,7 +36,7 @@ #include "hw/qdev-properties.h" #include "hw/core/boards.h" #include "hw/sysbus.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "migration/vmstate.h" #include "trace.h" =20 diff --git a/hw/gpio/stm32l4x5_gpio.c b/hw/gpio/stm32l4x5_gpio.c index a5a38da6384..5686bd53c23 100644 --- a/hw/gpio/stm32l4x5_gpio.c +++ b/hw/gpio/stm32l4x5_gpio.c @@ -21,7 +21,7 @@ #include "hw/gpio/stm32l4x5_gpio.h" #include "hw/core/irq.h" #include "hw/core/clock.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "qapi/visitor.h" #include "qapi/error.h" diff --git a/hw/mips/boston.c b/hw/mips/boston.c index b4b4a86a5fa..b63b27d03fa 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -30,7 +30,7 @@ #include "hw/mips/bootloader.h" #include "hw/mips/cps.h" #include "hw/pci-host/xilinx-pcie.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/mips/cps.c b/hw/mips/cps.c index e47695e2b0a..13f048ef9c9 100644 --- a/hw/mips/cps.c +++ b/hw/mips/cps.c @@ -22,7 +22,7 @@ #include "qemu/module.h" #include "hw/mips/cps.h" #include "hw/mips/mips.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "system/tcg.h" #include "system/reset.h" diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 2b0eb8c478e..e5ed0b56923 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -58,7 +58,7 @@ #include "system/kvm.h" #include "semihosting/semihost.h" #include "hw/mips/cps.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "target/mips/internal.h" #include "trace.h" #include "cpu.h" diff --git a/hw/misc/npcm7xx_mft.c b/hw/misc/npcm7xx_mft.c index 514d29f2015..0bbae111cf9 100644 --- a/hw/misc/npcm7xx_mft.c +++ b/hw/misc/npcm7xx_mft.c @@ -16,7 +16,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/misc/npcm7xx_mft.h" #include "hw/misc/npcm7xx_pwm.h" diff --git a/hw/misc/npcm7xx_pwm.c b/hw/misc/npcm7xx_pwm.c index 2e72d1c7d4f..39ac0dbe2a5 100644 --- a/hw/misc/npcm7xx_pwm.c +++ b/hw/misc/npcm7xx_pwm.c @@ -16,7 +16,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/misc/npcm7xx_pwm.h" #include "hw/registerfields.h" diff --git a/hw/misc/npcm_clk.c b/hw/misc/npcm_clk.c index e202a8a2998..bc9ee975de7 100644 --- a/hw/misc/npcm_clk.c +++ b/hw/misc/npcm_clk.c @@ -18,7 +18,7 @@ =20 #include "hw/misc/npcm_clk.h" #include "hw/timer/npcm7xx_timer.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/log.h" diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c index d4af2cd6963..1b012d1cc1e 100644 --- a/hw/misc/stm32l4x5_rcc.c +++ b/hw/misc/stm32l4x5_rcc.c @@ -25,7 +25,7 @@ #include "hw/misc/stm32l4x5_rcc_internals.h" #include "hw/core/clock.h" #include "hw/core/irq.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/registerfields.h" diff --git a/hw/misc/stm32l4x5_syscfg.c b/hw/misc/stm32l4x5_syscfg.c index de488a46780..52495610d1b 100644 --- a/hw/misc/stm32l4x5_syscfg.c +++ b/hw/misc/stm32l4x5_syscfg.c @@ -27,7 +27,7 @@ #include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/core/clock.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "qapi/error.h" #include "hw/misc/stm32l4x5_syscfg.h" #include "hw/gpio/stm32l4x5_gpio.h" diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index 010387beec4..cc18b21b22b 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -22,7 +22,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/registerfields.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "qom/object.h" #include "hw/qdev-properties.h" #include "qapi/error.h" diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c index 9eb39a6b846..704f4387684 100644 --- a/hw/net/npcm7xx_emc.c +++ b/hw/net/npcm7xx_emc.c @@ -32,7 +32,7 @@ #include /* for crc32 */ =20 #include "hw/core/irq.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/net/npcm7xx_emc.h" #include "net/eth.h" diff --git a/hw/timer/armv7m_systick.c b/hw/timer/armv7m_systick.c index c9e0f4c2e17..baba0817b8f 100644 --- a/hw/timer/armv7m_systick.c +++ b/hw/timer/armv7m_systick.c @@ -14,7 +14,7 @@ #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/sysbus.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "qemu/timer.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c index 57fea11a855..5f4848ef618 100644 --- a/hw/timer/cmsdk-apb-dualtimer.c +++ b/hw/timer/cmsdk-apb-dualtimer.c @@ -25,7 +25,7 @@ #include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/registerfields.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/timer/cmsdk-apb-dualtimer.h" #include "migration/vmstate.h" =20 diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c index 8b7595731cc..d80bf1f96d0 100644 --- a/hw/timer/cmsdk-apb-timer.c +++ b/hw/timer/cmsdk-apb-timer.c @@ -35,7 +35,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/registerfields.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/timer/cmsdk-apb-timer.h" #include "migration/vmstate.h" =20 diff --git a/hw/timer/npcm7xx_timer.c b/hw/timer/npcm7xx_timer.c index e09e4ee03ad..0e62add74d3 100644 --- a/hw/timer/npcm7xx_timer.c +++ b/hw/timer/npcm7xx_timer.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" =20 #include "hw/core/irq.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/timer/npcm7xx_timer.h" #include "migration/vmstate.h" diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c index bb364e815be..de9d354483b 100644 --- a/hw/timer/sse-counter.c +++ b/hw/timer/sse-counter.c @@ -35,7 +35,7 @@ #include "hw/sysbus.h" #include "hw/registerfields.h" #include "hw/core/clock.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "migration/vmstate.h" =20 /* Registers in the control frame */ diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c index fc48179d25d..1de882f3eb3 100644 --- a/hw/timer/sse-timer.c +++ b/hw/timer/sse-timer.c @@ -44,7 +44,7 @@ #include "hw/core/irq.h" #include "hw/registerfields.h" #include "hw/core/clock.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" =20 diff --git a/hw/timer/stellaris-gptm.c b/hw/timer/stellaris-gptm.c index d97b2f8309c..37cd760318e 100644 --- a/hw/timer/stellaris-gptm.c +++ b/hw/timer/stellaris-gptm.c @@ -12,7 +12,7 @@ #include "qemu/timer.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/timer/stellaris-gptm.h" =20 static void gptm_update_irq(gptm_state *s) diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watch= dog.c index e1a2a33d73e..f1dd7d66eee 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -30,7 +30,7 @@ #include "hw/core/irq.h" #include "hw/qdev-properties.h" #include "hw/registerfields.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" #include "migration/vmstate.h" =20 diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 5989c3ba177..894799c02c7 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -30,7 +30,7 @@ #include "system/kvm.h" #include "system/qtest.h" #include "hw/qdev-properties.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "fpu_helper.h" #ifndef CONFIG_USER_ONLY #include "semihosting/semihost.h" diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index 1eeed44e336..ecc5e093a40 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -34,7 +34,7 @@ #include "fpu/softfloat.h" #include "qemu/module.h" #include "migration/vmstate.h" -#include "hw/qdev-clock.h" +#include "hw/core/qdev-clock.h" #include "accel/tcg/cpu-ops.h" #ifndef CONFIG_USER_ONLY #include "system/memory.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764254495; cv=none; d=zohomail.com; s=zohoarc; b=e9pQX+17vA19IfqqsiA9DQZtGZNMfbLs5lu8Nb4/vcs/i0e4Da4FgsRQkSaIntlHum5sWHz1cakPhpkkHsujedueAJVGzpLKKLX5d9cZBVIS1RrExiqilWrvdZyUTJ61Q5UrHShHvZbT0M8she1XxGjGSa4oJiFxWTmYj6XGGJw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764254495; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=D4KE57wrb8lisBfg0NrIH7xaAqi5XGDQZTTo6rKdZUQ=; b=kGwvZpJbl0H+xqRk5Z9JGX15VF4XvTmESX6VDNau7M+ExIlXb63gn7hOIE96DOYbdCCwQheRYJgn53SYLv/hRfSjbkUlogY0pu17hBFIYrXEfFnX0SIIQ3twWNjOCq1g7FkNDvNwojDGBfYkH3OnLSSP0B7TErBkEHBv3VdAof4= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764254495756702.6236945602745; Thu, 27 Nov 2025 06:41:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObsi-000461-FC; Thu, 27 Nov 2025 08:17:57 -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 1vObqv-0002fS-B0 for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vObqj-0001Gz-73 for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:57 -0500 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-93-qsAiEOMsObeijav8Z8xQww-1; Thu, 27 Nov 2025 08:15:50 -0500 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-6411c626af4so978351a12.1 for ; Thu, 27 Nov 2025 05:15:50 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-64751035d4csm1486050a12.21.2025.11.27.05.15.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D4KE57wrb8lisBfg0NrIH7xaAqi5XGDQZTTo6rKdZUQ=; b=eE0UO4P+qYQ6twDIlbvmo4UkU8UUiuX9ql2mnHjvsP6i7CGtSiwTsMCQgioFPHDfqf1x+k PfAXAYI8d6RgG3MVJ8C7b1TKIghxJZi2USUdoxtj63pXhIhDgWC7RWFb/NFQFpFPGLZrxO uAqb2FDM6iAevC5fHYlGRbjqCg4lMgc= X-MC-Unique: qsAiEOMsObeijav8Z8xQww-1 X-Mimecast-MFC-AGG-ID: qsAiEOMsObeijav8Z8xQww_1764249349 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249348; x=1764854148; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=D4KE57wrb8lisBfg0NrIH7xaAqi5XGDQZTTo6rKdZUQ=; b=ad0+8OQDA93p6HavOmhk4l+OOwDGnjfXx+bHlXbTzq6YaWb1DuSs+x+5j9iRCwGh6i pfIJBCpQdMDLG6YtXBsmqczS91Ux958ya0TqdphadAMkjeGQNLdrVDD1V+OUOg41Lo3D lWTp4MTHEf871Fb8CTyYv3Nx9e5ji/8pLMLtfP8mjvu9rvqD/XTWL8FhxXCBcUxdQqCm x2MHdHDG/M4wDafUJy0MkXUmfl6fXJR4YAPjvKqcCL+faCtiobMKU48r29yi3vJH4M5J CO/pWgmTD4nIQJGV6uB6Vx2DQ7xgYq7MW43qm8wFlQLVYY+EPChbl9eRfQ49kxiIb1IW yBPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249348; x=1764854148; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=D4KE57wrb8lisBfg0NrIH7xaAqi5XGDQZTTo6rKdZUQ=; b=NI8odrRrlE+90kG7yyKFV1otcd5DgQQXRxQ/hso6qyBpLbei+yVd0hxgYcV9kaoq8t +CS8BKMD3eS+RuYFBm5RPuncoCM6au3cOxdVjI/v2RZRp/hLaeCw2/dhN3zMJTiyMSbX RyrRgXJrVOZDkTaytHsb95SNksBQDMPGPWgsG9ATlVR4VktdigipGVB1yLDgzDnDUuyS vkgj5nyF/BCqZldkI6ym1knYjcc6oyqv7bfUJ6q6jgU3yqeOXhftMlCokgStpmJv/pkP MoN3111CZ4FvPEA2rx9vKi3r73rEiJS4nLjM5b0XXmn9Kf6ZgMTf5G7JUhxmD/xVuf1v nApg== X-Gm-Message-State: AOJu0YyPSqp3/YXGB0IyewsFJgWXlXCjJuAZ3fO/DQjvbvNhpkK6Ii41 r88soaLcNAJ0NbXS4WEzeHgq6tRXAIkQA5y5ToOBSxeOxwZ1SAsq7OTb5bN/Lv7Kb5gH156dARi Di53p9cJPJ1AOmA7RIY1ewHi9yJq4NSueRFyTQTjaJvWKWvFyXcWnF3jkHCK4Afq8f9U0gMEIPr o0CVbl3NKsULfGX9Dn7rnVONeaBVeHFwmN93PHDLvG X-Gm-Gg: ASbGncsoPUO55codNEcfK+MjV5hBvKYqp4kbr1sPrTL7d4p7m5MmXVQcRYBh6mqTLXp a+Zovv1ve/FOCAQLx5dFR6n3baVfNytVz3Q8GsUZut+2afT8O4wHd2AhIB6JZvpQfiNAdejtSP0 uaWT5ZwwiQYQLXxR+TRoSVqBZY8Cofyw8tmSOYPG3Ksb0DB+JYz36R6i6F0JRCIAW8h6T7HkEZ4 lIGStow0safeQH1v/x9lWCcF85szL2FPgE59FMWlpEeGJZyghDiMJLM25zR3JseK3h6W3N9Mu4c GoFakIB6SyyEos7IekXEni8TJyEvzqNojDOHM6X1/BGUMw/LOWVdHsGJS/8YkH/AXab9ZXIaX1U 50+doboBnPCIym0SSG8CMkJ5GwpCdrmLRVNpZ0tlHxprc4Q/aYXnwWloiN5Mf8urlRhQaEI+0Un cEbzIBy0TCxix4RAc= X-Received: by 2002:a05:6402:1d50:b0:640:ebe3:dd55 with SMTP id 4fb4d7f45d1cf-645eb23f84emr8916723a12.6.1764249347553; Thu, 27 Nov 2025 05:15:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IGnWuLnBZcxrl5O5Vrmalx8T3tl3xy776rikuos4MHWCODRYNyttKF4uIclFOXjJXKywX/crA== X-Received: by 2002:a05:6402:1d50:b0:640:ebe3:dd55 with SMTP id 4fb4d7f45d1cf-645eb23f84emr8916653a12.6.1764249346327; Thu, 27 Nov 2025 05:15:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 17/28] include: move hw/qdev-core.h to hw/core/, rename Date: Thu, 27 Nov 2025 14:15:04 +0100 Message-ID: <20251127131516.80807-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764254498424019200 Content-Type: text/plain; charset="utf-8" Call it hw/core/qdev.h to avoid the duplication in the name. Signed-off-by: Paolo Bonzini --- docs/devel/qdev-api.rst | 2 +- hw/audio/intel-hda.h | 2 +- hw/core/guest-loader.h | 2 +- hw/s390x/ccw-device.h | 2 +- hw/s390x/ipl.h | 2 +- hw/usb/canokey.h | 2 +- hw/usb/ccid.h | 2 +- hw/usb/u2f.h | 2 +- include/block/aio.h | 2 +- include/hw/acpi/acpi_aml_interface.h | 2 +- include/hw/acpi/acpi_dev_interface.h | 2 +- include/hw/acpi/cpu.h | 2 +- include/hw/acpi/memory_hotplug.h | 2 +- include/hw/acpi/vmclock.h | 2 +- include/hw/acpi/vmgenid.h | 2 +- include/hw/core/cpu.h | 2 +- include/hw/core/generic-loader.h | 2 +- include/hw/{qdev-core.h =3D> core/qdev.h} | 0 include/hw/cpu/cluster.h | 2 +- include/hw/cpu/core.h | 2 +- include/hw/display/dm163.h | 2 +- include/hw/fsi/fsi-master.h | 2 +- include/hw/fsi/fsi.h | 2 +- include/hw/fsi/lbus.h | 2 +- include/hw/hyperv/vmbus.h | 2 +- include/hw/i2c/i2c.h | 2 +- include/hw/i386/sgx-epc.h | 2 +- include/hw/input/adb.h | 2 +- include/hw/ipack/ipack.h | 2 +- include/hw/ipmi/ipmi.h | 2 +- include/hw/isa/isa.h | 2 +- include/hw/mem/memory-device.h | 2 +- include/hw/mem/pc-dimm.h | 2 +- include/hw/misc/auxbus.h | 2 +- include/hw/misc/led.h | 2 +- include/hw/misc/vmcoreinfo.h | 2 +- include/hw/nvram/xlnx-bbram.h | 2 +- include/hw/nvram/xlnx-efuse.h | 2 +- include/hw/ppc/pnv_adu.h | 2 +- include/hw/ppc/pnv_lpc.h | 2 +- include/hw/ppc/pnv_occ.h | 2 +- include/hw/ppc/pnv_psi.h | 2 +- include/hw/ppc/pnv_sbe.h | 2 +- include/hw/ppc/spapr_cpu_core.h | 2 +- include/hw/ppc/spapr_drc.h | 2 +- include/hw/ppc/spapr_tpm_proxy.h | 2 +- include/hw/ppc/xics.h | 2 +- include/hw/qdev-properties.h | 2 +- include/hw/register.h | 2 +- include/hw/s390x/ap-device.h | 2 +- include/hw/s390x/event-facility.h | 2 +- include/hw/s390x/storage-attributes.h | 2 +- include/hw/s390x/storage-keys.h | 2 +- include/hw/s390x/tod.h | 2 +- include/hw/scsi/scsi.h | 2 +- include/hw/sd/sd.h | 2 +- include/hw/ssi/ssi.h | 2 +- include/hw/sysbus.h | 2 +- include/hw/usb/usb.h | 2 +- include/hw/virtio/virtio-bus.h | 2 +- include/hw/virtio/virtio.h | 2 +- include/hw/watchdog/wdt_diag288.h | 2 +- include/hw/xen/xen-bus.h | 2 +- include/monitor/qdev.h | 2 +- migration/migration.h | 2 +- backends/hostmem.c | 2 +- block/block-backend.c | 2 +- hw/acpi/erst.c | 2 +- hw/acpi/memory_hotplug.c | 2 +- hw/arm/allwinner-h3.c | 2 +- hw/arm/allwinner-r40.c | 2 +- hw/arm/npcm7xx_boards.c | 2 +- hw/arm/npcm8xx_boards.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/smmuv3.c | 2 +- hw/audio/model.c | 2 +- hw/block/vhost-user-blk.c | 2 +- hw/char/sh_serial.c | 2 +- hw/core/cpu-system.c | 2 +- hw/core/cpu-user.c | 2 +- hw/core/gpio.c | 2 +- hw/core/qdev-clock.c | 2 +- hw/core/qdev-fw.c | 2 +- hw/core/qdev-hotplug.c | 2 +- hw/core/qdev-user.c | 2 +- hw/core/vm-change-state-handler.c | 2 +- hw/display/artist.c | 2 +- hw/fsi/aspeed_apb2opb.c | 2 +- hw/hyperv/hv-balloon.c | 2 +- hw/i2c/i2c_mux_pca954x.c | 2 +- hw/ppc/pnv_homer.c | 2 +- hw/remote/machine.c | 2 +- hw/remote/remote-obj.c | 2 +- hw/remote/vfio-user-obj.c | 2 +- hw/scsi/vhost-user-scsi.c | 2 +- hw/sd/core.c | 2 +- hw/tpm/tpm_ppi.c | 2 +- hw/vfio/iommufd.c | 2 +- hw/virtio/vdpa-dev.c | 2 +- hw/xen/xen_pvdev.c | 2 +- monitor/hmp.c | 2 +- qom/object.c | 2 +- qom/qom-hmp-cmds.c | 2 +- qom/qom-qmp-cmds.c | 2 +- stubs/hotplug-stubs.c | 2 +- stubs/sysbus.c | 2 +- system/bootdevice.c | 2 +- system/physmem.c | 2 +- system/qtest.c | 2 +- tests/qtest/fuzz/generic_fuzz.c | 2 +- ui/console.c | 2 +- ui/vdagent.c | 2 +- ui/vnc.c | 2 +- 113 files changed, 112 insertions(+), 112 deletions(-) rename include/hw/{qdev-core.h =3D> core/qdev.h} (100%) diff --git a/docs/devel/qdev-api.rst b/docs/devel/qdev-api.rst index 3f35eea025a..27b534ba127 100644 --- a/docs/devel/qdev-api.rst +++ b/docs/devel/qdev-api.rst @@ -4,4 +4,4 @@ QEMU Device (qdev) API Reference =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D =20 -.. kernel-doc:: include/hw/qdev-core.h +.. kernel-doc:: include/hw/core/qdev.h diff --git a/hw/audio/intel-hda.h b/hw/audio/intel-hda.h index 8d710eee5d6..174cf694f49 100644 --- a/hw/audio/intel-hda.h +++ b/hw/audio/intel-hda.h @@ -1,7 +1,7 @@ #ifndef HW_INTEL_HDA_H #define HW_INTEL_HDA_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 /* --------------------------------------------------------------------- */ diff --git a/hw/core/guest-loader.h b/hw/core/guest-loader.h index 07f4b4884b8..214ccf1ba5d 100644 --- a/hw/core/guest-loader.h +++ b/hw/core/guest-loader.h @@ -14,7 +14,7 @@ #ifndef GUEST_LOADER_H #define GUEST_LOADER_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 struct GuestLoaderState { diff --git a/hw/s390x/ccw-device.h b/hw/s390x/ccw-device.h index 4439feb1403..15f64cfb636 100644 --- a/hw/s390x/ccw-device.h +++ b/hw/s390x/ccw-device.h @@ -12,7 +12,7 @@ #ifndef HW_S390X_CCW_DEVICE_H #define HW_S390X_CCW_DEVICE_H #include "qom/object.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/s390x/css.h" #include "hw/s390x/css-bridge.h" =20 diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index 505cded490c..086e57681c2 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -17,7 +17,7 @@ #include "exec/target_page.h" #include "system/address-spaces.h" #include "system/memory.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/s390x/ipl/qipl.h" #include "qom/object.h" #include "target/s390x/kvm/pv.h" diff --git a/hw/usb/canokey.h b/hw/usb/canokey.h index 1b60d734850..3d489a36ce7 100644 --- a/hw/usb/canokey.h +++ b/hw/usb/canokey.h @@ -10,7 +10,7 @@ #ifndef CANOKEY_H #define CANOKEY_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #define TYPE_CANOKEY "canokey" #define CANOKEY(obj) \ diff --git a/hw/usb/ccid.h b/hw/usb/ccid.h index 6b82a55bd4c..4959f7ea0c1 100644 --- a/hw/usb/ccid.h +++ b/hw/usb/ccid.h @@ -10,7 +10,7 @@ #ifndef CCID_H #define CCID_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 typedef struct CCIDCardInfo CCIDCardInfo; diff --git a/hw/usb/u2f.h b/hw/usb/u2f.h index 8bff13141af..85ff7d0ffab 100644 --- a/hw/usb/u2f.h +++ b/hw/usb/u2f.h @@ -26,7 +26,7 @@ #ifndef U2F_H #define U2F_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #define U2FHID_PACKET_SIZE 64 #define U2FHID_PENDING_IN_NUM 32 diff --git a/include/block/aio.h b/include/block/aio.h index 6049e6a0f4c..cc3d5f25a24 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -24,7 +24,7 @@ #include "qemu/thread.h" #include "qemu/timer.h" #include "block/graph-lock.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 =20 typedef struct BlockAIOCB BlockAIOCB; diff --git a/include/hw/acpi/acpi_aml_interface.h b/include/hw/acpi/acpi_am= l_interface.h index 11748a88664..4be1b4acda6 100644 --- a/include/hw/acpi/acpi_aml_interface.h +++ b/include/hw/acpi/acpi_aml_interface.h @@ -3,7 +3,7 @@ =20 #include "qom/object.h" #include "hw/acpi/aml-build.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #define TYPE_ACPI_DEV_AML_IF "acpi-dev-aml-interface" typedef struct AcpiDevAmlIfClass AcpiDevAmlIfClass; diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_de= v_interface.h index 8294f8f0ccc..5927e40eaff 100644 --- a/include/hw/acpi/acpi_dev_interface.h +++ b/include/hw/acpi/acpi_dev_interface.h @@ -3,7 +3,7 @@ =20 #include "qapi/qapi-types-acpi.h" #include "qom/object.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 /* These values are part of guest ABI, and can not be changed */ typedef enum { diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h index a64d19445cc..557219d2c63 100644 --- a/include/hw/acpi/cpu.h +++ b/include/hw/acpi/cpu.h @@ -13,7 +13,7 @@ #define ACPI_CPU_H =20 #include "qapi/qapi-types-acpi.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" #include "hw/core/boards.h" diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotp= lug.h index 38841d7b065..eb7f460afec 100644 --- a/include/hw/acpi/memory_hotplug.h +++ b/include/hw/acpi/memory_hotplug.h @@ -2,7 +2,7 @@ #define QEMU_HW_ACPI_MEMORY_HOTPLUG_H =20 #include "qapi/qapi-types-acpi.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" =20 diff --git a/include/hw/acpi/vmclock.h b/include/hw/acpi/vmclock.h index 5605605812c..d88176d1951 100644 --- a/include/hw/acpi/vmclock.h +++ b/include/hw/acpi/vmclock.h @@ -2,7 +2,7 @@ #define ACPI_VMCLOCK_H =20 #include "hw/acpi/bios-linker-loader.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qemu/uuid.h" #include "qom/object.h" =20 diff --git a/include/hw/acpi/vmgenid.h b/include/hw/acpi/vmgenid.h index fb135d5bcbe..10985412726 100644 --- a/include/hw/acpi/vmgenid.h +++ b/include/hw/acpi/vmgenid.h @@ -2,7 +2,7 @@ #define ACPI_VMGENID_H =20 #include "hw/acpi/bios-linker-loader.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qemu/uuid.h" #include "qom/object.h" =20 diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 9615051774d..f6f17df9e64 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -20,7 +20,7 @@ #ifndef QEMU_CPU_H #define QEMU_CPU_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "disas/dis-asm.h" #include "exec/breakpoint.h" #include "exec/hwaddr.h" diff --git a/include/hw/core/generic-loader.h b/include/hw/core/generic-loa= der.h index 19d87b39c8b..ed6d3ba9309 100644 --- a/include/hw/core/generic-loader.h +++ b/include/hw/core/generic-loader.h @@ -19,7 +19,7 @@ #define GENERIC_LOADER_H =20 #include "elf.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 struct GenericLoaderState { diff --git a/include/hw/qdev-core.h b/include/hw/core/qdev.h similarity index 100% rename from include/hw/qdev-core.h rename to include/hw/core/qdev.h diff --git a/include/hw/cpu/cluster.h b/include/hw/cpu/cluster.h index 53fbf36af54..b79de065ad1 100644 --- a/include/hw/cpu/cluster.h +++ b/include/hw/cpu/cluster.h @@ -20,7 +20,7 @@ #ifndef HW_CPU_CLUSTER_H #define HW_CPU_CLUSTER_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 /* diff --git a/include/hw/cpu/core.h b/include/hw/cpu/core.h index 98ab91647eb..22c53ff288a 100644 --- a/include/hw/cpu/core.h +++ b/include/hw/cpu/core.h @@ -9,7 +9,7 @@ #ifndef HW_CPU_CORE_H #define HW_CPU_CORE_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 #define TYPE_CPU_CORE "cpu-core" diff --git a/include/hw/display/dm163.h b/include/hw/display/dm163.h index 4377f77bb75..e1d2e05abc0 100644 --- a/include/hw/display/dm163.h +++ b/include/hw/display/dm163.h @@ -13,7 +13,7 @@ #define HW_DISPLAY_DM163_H =20 #include "qom/object.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #define TYPE_DM163 "dm163" OBJECT_DECLARE_SIMPLE_TYPE(DM163State, DM163); diff --git a/include/hw/fsi/fsi-master.h b/include/hw/fsi/fsi-master.h index b634ecd3938..60ddaa994f7 100644 --- a/include/hw/fsi/fsi-master.h +++ b/include/hw/fsi/fsi-master.h @@ -8,7 +8,7 @@ #define FSI_FSI_MASTER_H =20 #include "system/memory.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/fsi/fsi.h" #include "hw/fsi/cfam.h" =20 diff --git a/include/hw/fsi/fsi.h b/include/hw/fsi/fsi.h index f34765ed80b..26d7e89c228 100644 --- a/include/hw/fsi/fsi.h +++ b/include/hw/fsi/fsi.h @@ -8,7 +8,7 @@ #define FSI_FSI_H =20 #include "system/memory.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/fsi/lbus.h" #include "qemu/bitops.h" =20 diff --git a/include/hw/fsi/lbus.h b/include/hw/fsi/lbus.h index 12519073cd3..1b894509fe4 100644 --- a/include/hw/fsi/lbus.h +++ b/include/hw/fsi/lbus.h @@ -7,7 +7,7 @@ #ifndef FSI_LBUS_H #define FSI_LBUS_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qemu/units.h" #include "system/memory.h" =20 diff --git a/include/hw/hyperv/vmbus.h b/include/hw/hyperv/vmbus.h index 06b948bbb08..e0ef2f2c02e 100644 --- a/include/hw/hyperv/vmbus.h +++ b/include/hw/hyperv/vmbus.h @@ -12,7 +12,7 @@ =20 #include "system/system.h" #include "system/dma.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "migration/vmstate.h" #include "hw/hyperv/vmbus-proto.h" #include "qemu/uuid.h" diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 2a3abacd1ba..dd5930f4b5e 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -1,7 +1,7 @@ #ifndef QEMU_I2C_H #define QEMU_I2C_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 /* The QEMU I2C implementation only supports simple transfers that complete diff --git a/include/hw/i386/sgx-epc.h b/include/hw/i386/sgx-epc.h index 41d55da4799..ba976611628 100644 --- a/include/hw/i386/sgx-epc.h +++ b/include/hw/i386/sgx-epc.h @@ -12,7 +12,7 @@ #ifndef QEMU_SGX_EPC_H #define QEMU_SGX_EPC_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/i386/hostmem-epc.h" =20 #define TYPE_SGX_EPC "sgx-epc" diff --git a/include/hw/input/adb.h b/include/hw/input/adb.h index 20fced15f70..10791958302 100644 --- a/include/hw/input/adb.h +++ b/include/hw/input/adb.h @@ -26,7 +26,7 @@ #ifndef ADB_H #define ADB_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 #define MAX_ADB_DEVICES 16 diff --git a/include/hw/ipack/ipack.h b/include/hw/ipack/ipack.h index d86ef84233c..fdd6c069c5a 100644 --- a/include/hw/ipack/ipack.h +++ b/include/hw/ipack/ipack.h @@ -11,7 +11,7 @@ #ifndef QEMU_IPACK_H #define QEMU_IPACK_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/core/irq.h" #include "qom/object.h" =20 diff --git a/include/hw/ipmi/ipmi.h b/include/hw/ipmi/ipmi.h index cd581aa1342..dabbb9ec5d8 100644 --- a/include/hw/ipmi/ipmi.h +++ b/include/hw/ipmi/ipmi.h @@ -26,7 +26,7 @@ #define HW_IPMI_H =20 #include "system/memory.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 #define MAX_IPMI_MSG_SIZE 300 diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index a82c5f1004f..94bff33fcc7 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -5,7 +5,7 @@ =20 #include "system/memory.h" #include "system/ioport.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 #define ISA_NUM_IRQS 16 diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h index c0a58087ccc..10adcd3b8c0 100644 --- a/include/hw/mem/memory-device.h +++ b/include/hw/mem/memory-device.h @@ -13,7 +13,7 @@ #ifndef MEMORY_DEVICE_H #define MEMORY_DEVICE_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qapi/qapi-types-machine.h" #include "qom/object.h" =20 diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index e0dbdd43dca..f2df951bafd 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -17,7 +17,7 @@ #define QEMU_PC_DIMM_H =20 #include "system/memory.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 #define TYPE_PC_DIMM "pc-dimm" diff --git a/include/hw/misc/auxbus.h b/include/hw/misc/auxbus.h index 0051e039471..5bfdd05e152 100644 --- a/include/hw/misc/auxbus.h +++ b/include/hw/misc/auxbus.h @@ -26,7 +26,7 @@ #define HW_MISC_AUXBUS_H =20 #include "system/memory.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 typedef enum AUXCommand AUXCommand; diff --git a/include/hw/misc/led.h b/include/hw/misc/led.h index 29c08795708..4d077a7c43e 100644 --- a/include/hw/misc/led.h +++ b/include/hw/misc/led.h @@ -9,7 +9,7 @@ #define HW_MISC_LED_H =20 #include "qom/object.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #define TYPE_LED "led" =20 diff --git a/include/hw/misc/vmcoreinfo.h b/include/hw/misc/vmcoreinfo.h index 1aa44771632..3cafc7d42e1 100644 --- a/include/hw/misc/vmcoreinfo.h +++ b/include/hw/misc/vmcoreinfo.h @@ -12,7 +12,7 @@ #ifndef VMCOREINFO_H #define VMCOREINFO_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "standard-headers/linux/qemu_fw_cfg.h" #include "qom/object.h" =20 diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h index ad2e4a250f5..63558dbc329 100644 --- a/include/hw/nvram/xlnx-bbram.h +++ b/include/hw/nvram/xlnx-bbram.h @@ -27,7 +27,7 @@ #define XLNX_BBRAM_H =20 #include "system/block-backend.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/register.h" diff --git a/include/hw/nvram/xlnx-efuse.h b/include/hw/nvram/xlnx-efuse.h index ef14fb0528a..08a9ce790d7 100644 --- a/include/hw/nvram/xlnx-efuse.h +++ b/include/hw/nvram/xlnx-efuse.h @@ -28,7 +28,7 @@ #define XLNX_EFUSE_H =20 #include "system/block-backend.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #define TYPE_XLNX_EFUSE "xlnx-efuse" OBJECT_DECLARE_SIMPLE_TYPE(XlnxEFuse, XLNX_EFUSE); diff --git a/include/hw/ppc/pnv_adu.h b/include/hw/ppc/pnv_adu.h index f9dbd8c8b37..d3a935a46d6 100644 --- a/include/hw/ppc/pnv_adu.h +++ b/include/hw/ppc/pnv_adu.h @@ -11,7 +11,7 @@ =20 #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_lpc.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #define TYPE_PNV_ADU "pnv-adu" =20 diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h index 266d56214f8..c219f87b169 100644 --- a/include/hw/ppc/pnv_lpc.h +++ b/include/hw/ppc/pnv_lpc.h @@ -22,7 +22,7 @@ =20 #include "system/memory.h" #include "hw/ppc/pnv.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/isa/isa.h" /* For ISA_NUM_IRQS */ =20 #define TYPE_PNV_LPC "pnv-lpc" diff --git a/include/hw/ppc/pnv_occ.h b/include/hw/ppc/pnv_occ.h index 013ea2e53e3..84bdf5004da 100644 --- a/include/hw/ppc/pnv_occ.h +++ b/include/hw/ppc/pnv_occ.h @@ -21,7 +21,7 @@ #define PPC_PNV_OCC_H =20 #include "system/memory.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #define TYPE_PNV_OCC "pnv-occ" OBJECT_DECLARE_TYPE(PnvOCC, PnvOCCClass, diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h index cf7f95a6b1f..8a04860aa8b 100644 --- a/include/hw/ppc/pnv_psi.h +++ b/include/hw/ppc/pnv_psi.h @@ -23,7 +23,7 @@ #include "hw/sysbus.h" #include "hw/ppc/xics.h" #include "hw/ppc/xive.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #define TYPE_PNV_PSI "pnv-psi" OBJECT_DECLARE_TYPE(PnvPsi, PnvPsiClass, diff --git a/include/hw/ppc/pnv_sbe.h b/include/hw/ppc/pnv_sbe.h index 48a8b86a80b..d5d76a4de16 100644 --- a/include/hw/ppc/pnv_sbe.h +++ b/include/hw/ppc/pnv_sbe.h @@ -21,7 +21,7 @@ #define PPC_PNV_SBE_H =20 #include "system/memory.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #define TYPE_PNV_SBE "pnv-sbe" OBJECT_DECLARE_TYPE(PnvSBE, PnvSBEClass, PNV_SBE) diff --git a/include/hw/ppc/spapr_cpu_core.h b/include/hw/ppc/spapr_cpu_cor= e.h index 68f70834832..273bb332020 100644 --- a/include/hw/ppc/spapr_cpu_core.h +++ b/include/hw/ppc/spapr_cpu_core.h @@ -10,7 +10,7 @@ #define HW_SPAPR_CPU_CORE_H =20 #include "hw/cpu/core.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "target/ppc/cpu-qom.h" #include "target/ppc/cpu.h" #include "qom/object.h" diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index 9ff42909c93..bb80f95d91e 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -16,7 +16,7 @@ #include #include "qom/object.h" #include "system/runstate.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qapi/error.h" =20 #define TYPE_SPAPR_DR_CONNECTOR "spapr-dr-connector" diff --git a/include/hw/ppc/spapr_tpm_proxy.h b/include/hw/ppc/spapr_tpm_pr= oxy.h index 96d2a9697e5..831d36a02ff 100644 --- a/include/hw/ppc/spapr_tpm_proxy.h +++ b/include/hw/ppc/spapr_tpm_proxy.h @@ -14,7 +14,7 @@ #define HW_SPAPR_TPM_PROXY_H =20 #include "qom/object.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #define TYPE_SPAPR_TPM_PROXY "spapr-tpm-proxy" OBJECT_DECLARE_SIMPLE_TYPE(SpaprTpmProxy, SPAPR_TPM_PROXY) diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 097fcdf00f9..3f78e371221 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -29,7 +29,7 @@ #define XICS_H =20 #include "system/memory.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 #define XICS_IPI 0x2 diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 60b81330097..d8745d4c65f 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -1,7 +1,7 @@ #ifndef QEMU_QDEV_PROPERTIES_H #define QEMU_QDEV_PROPERTIES_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 /** * Property: diff --git a/include/hw/register.h b/include/hw/register.h index 7b0f4c8b7a6..b3d20fee7d3 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -11,7 +11,7 @@ #ifndef REGISTER_H #define REGISTER_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "system/memory.h" #include "hw/registerfields.h" #include "qom/object.h" diff --git a/include/hw/s390x/ap-device.h b/include/hw/s390x/ap-device.h index e502745de5e..f746addb428 100644 --- a/include/hw/s390x/ap-device.h +++ b/include/hw/s390x/ap-device.h @@ -11,7 +11,7 @@ #ifndef HW_S390X_AP_DEVICE_H #define HW_S390X_AP_DEVICE_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 #define TYPE_AP_DEVICE "ap-device" diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-fac= ility.h index eac7a511003..5c556f2b4d8 100644 --- a/include/hw/s390x/event-facility.h +++ b/include/hw/s390x/event-facility.h @@ -16,7 +16,7 @@ #define HW_S390_SCLP_EVENT_FACILITY_H =20 #include "qemu/thread.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/s390x/sclp.h" #include "qom/object.h" =20 diff --git a/include/hw/s390x/storage-attributes.h b/include/hw/s390x/stora= ge-attributes.h index b5c6d8fa552..66716a97c05 100644 --- a/include/hw/s390x/storage-attributes.h +++ b/include/hw/s390x/storage-attributes.h @@ -12,7 +12,7 @@ #ifndef S390_STORAGE_ATTRIBUTES_H #define S390_STORAGE_ATTRIBUTES_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "monitor/monitor.h" #include "qom/object.h" =20 diff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-key= s.h index ac303001f57..2d02936c31c 100644 --- a/include/hw/s390x/storage-keys.h +++ b/include/hw/s390x/storage-keys.h @@ -12,7 +12,7 @@ #ifndef S390_STORAGE_KEYS_H #define S390_STORAGE_KEYS_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "monitor/monitor.h" #include "qom/object.h" =20 diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h index 0935e850891..bcb20994c87 100644 --- a/include/hw/s390x/tod.h +++ b/include/hw/s390x/tod.h @@ -11,7 +11,7 @@ #ifndef HW_S390_TOD_H #define HW_S390_TOD_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "tcg/s390-tod.h" #include "qom/object.h" =20 diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 044bd048b49..83782339d4b 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -3,7 +3,7 @@ =20 #include "block/aio.h" #include "hw/block/block.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "scsi/utils.h" #include "qemu/notify.h" #include "qom/object.h" diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index 91b5c40a5f8..d12f24955a5 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -30,7 +30,7 @@ #ifndef HW_SD_H #define HW_SD_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 #define OUT_OF_RANGE (1 << 31) diff --git a/include/hw/ssi/ssi.h b/include/hw/ssi/ssi.h index 2ad8033d8f5..6d6d8ccb3d4 100644 --- a/include/hw/ssi/ssi.h +++ b/include/hw/ssi/ssi.h @@ -13,7 +13,7 @@ #ifndef QEMU_SSI_H #define QEMU_SSI_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 typedef enum SSICSMode SSICSMode; diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h index 69eb62e29c8..c0d18d9e00b 100644 --- a/include/hw/sysbus.h +++ b/include/hw/sysbus.h @@ -3,7 +3,7 @@ =20 /* Devices attached directly to the main system bus. */ =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "system/memory.h" #include "qom/object.h" =20 diff --git a/include/hw/usb/usb.h b/include/hw/usb/usb.h index 26a9f3ecdee..78e2ceedd7f 100644 --- a/include/hw/usb/usb.h +++ b/include/hw/usb/usb.h @@ -26,7 +26,7 @@ */ =20 #include "system/memory.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qemu/iov.h" #include "qemu/queue.h" #include "qom/object.h" diff --git a/include/hw/virtio/virtio-bus.h b/include/hw/virtio/virtio-bus.h index 7ab8c9dab05..1a2d3961565 100644 --- a/include/hw/virtio/virtio-bus.h +++ b/include/hw/virtio/virtio-bus.h @@ -25,7 +25,7 @@ #ifndef VIRTIO_BUS_H #define VIRTIO_BUS_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/virtio/virtio.h" #include "qom/object.h" =20 diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index d97529c3f1e..91ff2fa21a5 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -15,7 +15,7 @@ #define QEMU_VIRTIO_H =20 #include "system/memory.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/virtio/virtio-features.h" #include "net/net.h" #include "migration/vmstate.h" diff --git a/include/hw/watchdog/wdt_diag288.h b/include/hw/watchdog/wdt_di= ag288.h index f72c1d3318d..c76f7e5d36b 100644 --- a/include/hw/watchdog/wdt_diag288.h +++ b/include/hw/watchdog/wdt_diag288.h @@ -1,7 +1,7 @@ #ifndef WDT_DIAG288_H #define WDT_DIAG288_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qom/object.h" =20 #define TYPE_WDT_DIAG288 "diag288" diff --git a/include/hw/xen/xen-bus.h b/include/hw/xen/xen-bus.h index bdbf1ed6fd0..4416123f1f9 100644 --- a/include/hw/xen/xen-bus.h +++ b/include/hw/xen/xen-bus.h @@ -8,7 +8,7 @@ #ifndef HW_XEN_BUS_H #define HW_XEN_BUS_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/xen/xen_backend_ops.h" #include "qemu/notify.h" #include "qemu/queue.h" diff --git a/include/monitor/qdev.h b/include/monitor/qdev.h index de33637869b..f85f25738d5 100644 --- a/include/monitor/qdev.h +++ b/include/monitor/qdev.h @@ -1,7 +1,7 @@ #ifndef MONITOR_QDEV_H #define MONITOR_QDEV_H =20 -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 /*** monitor commands ***/ =20 diff --git a/migration/migration.h b/migration/migration.h index 213b33fe6e5..fbe02d5bb1a 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -15,7 +15,7 @@ #define QEMU_MIGRATION_H =20 #include "exec/cpu-common.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qapi/qapi-types-migration.h" #include "qobject/json-writer.h" #include "qemu/thread.h" diff --git a/backends/hostmem.c b/backends/hostmem.c index d5834916648..67827c42b87 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -21,7 +21,7 @@ #include "qemu/mmap-alloc.h" #include "qemu/madvise.h" #include "qemu/cutils.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #ifdef CONFIG_NUMA #include diff --git a/block/block-backend.c b/block/block-backend.c index f8d6ba65c11..050e5b95350 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -16,7 +16,7 @@ #include "block/blockjob.h" #include "block/coroutines.h" #include "block/throttle-groups.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "system/blockdev.h" #include "system/runstate.h" #include "system/replay.h" diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c index 099cabb7ab7..10bbe37c170 100644 --- a/hw/acpi/erst.c +++ b/hw/acpi/erst.c @@ -11,7 +11,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "system/memory.h" #include "qom/object.h" #include "hw/pci/pci_device.h" diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index 2f17d45907d..1ddfdd17b75 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -2,7 +2,7 @@ #include "hw/acpi/memory_hotplug.h" #include "hw/mem/pc-dimm.h" #include "hw/core/boards.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "migration/vmstate.h" #include "trace.h" #include "qapi/error.h" diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index 6c4c369e991..757c89ef39f 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -22,7 +22,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/units.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/sysbus.h" #include "hw/char/serial-mm.h" #include "hw/misc/unimp.h" diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c index f6d4117a068..396e886af47 100644 --- a/hw/arm/allwinner-r40.c +++ b/hw/arm/allwinner-r40.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "qemu/units.h" #include "hw/core/boards.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/sysbus.h" #include "hw/char/serial-mm.h" #include "hw/misc/unimp.h" diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index fda375eb4c3..729306b33c5 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -23,7 +23,7 @@ #include "hw/i2c/smbus_eeprom.h" #include "hw/core/loader.h" #include "hw/nvram/eeprom_at24c.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/datadir.h" diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c index 292f44d807c..7252edf3dcb 100644 --- a/hw/arm/npcm8xx_boards.c +++ b/hw/arm/npcm8xx_boards.c @@ -22,7 +22,7 @@ #include "hw/arm/machines-qom.h" #include "hw/core/cpu.h" #include "hw/core/loader.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 65506768e41..d7f96b9d3e4 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -18,7 +18,7 @@ #include "hw/net/lan9118.h" #include "hw/net/smc91c111.h" #include "hw/pci/pci.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "net/net.h" #include "system/system.h" #include "hw/core/boards.h" diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index ae4fba15991..e391842dc33 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -22,7 +22,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/qdev-properties.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/pci/pci.h" #include "cpu.h" #include "exec/target_page.h" diff --git a/hw/audio/model.c b/hw/audio/model.c index 40929c6e77a..ff4e4b24528 100644 --- a/hw/audio/model.c +++ b/hw/audio/model.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "monitor/qdev.h" #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index c0cc5f69428..b399eab51a1 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -20,7 +20,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/cutils.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/virtio-blk-common.h" diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index ee430dd3d26..008a2ea2f04 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sh4/sh.h" diff --git a/hw/core/cpu-system.c b/hw/core/cpu-system.c index f601a083d14..5d5a4357399 100644 --- a/hw/core/cpu-system.c +++ b/hw/core/cpu-system.c @@ -24,7 +24,7 @@ #include "exec/cputlb.h" #include "system/memory.h" #include "qemu/target-info.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "hw/core/sysemu-cpu-ops.h" #include "migration/vmstate.h" diff --git a/hw/core/cpu-user.c b/hw/core/cpu-user.c index 7176791851b..270afe5b9f6 100644 --- a/hw/core/cpu-user.c +++ b/hw/core/cpu-user.c @@ -7,7 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "hw/core/cpu.h" #include "migration/vmstate.h" diff --git a/hw/core/gpio.c b/hw/core/gpio.c index 11f26a2f2dd..37cda5ce4d3 100644 --- a/hw/core/gpio.c +++ b/hw/core/gpio.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/core/irq.h" #include "qapi/error.h" =20 diff --git a/hw/core/qdev-clock.c b/hw/core/qdev-clock.c index b96525951cd..6e2967e433e 100644 --- a/hw/core/qdev-clock.c +++ b/hw/core/qdev-clock.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qapi/error.h" =20 /* diff --git a/hw/core/qdev-fw.c b/hw/core/qdev-fw.c index a587d2ddf90..f1489c02dfc 100644 --- a/hw/core/qdev-fw.c +++ b/hw/core/qdev-fw.c @@ -17,7 +17,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/fw-path-provider.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 const char *qdev_fw_name(DeviceState *dev) { diff --git a/hw/core/qdev-hotplug.c b/hw/core/qdev-hotplug.c index d2c39806c53..1d547e0dbdf 100644 --- a/hw/core/qdev-hotplug.c +++ b/hw/core/qdev-hotplug.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/core/boards.h" #include "qapi/error.h" =20 diff --git a/hw/core/qdev-user.c b/hw/core/qdev-user.c index 3d421d8f4e5..051f8fbd02d 100644 --- a/hw/core/qdev-user.c +++ b/hw/core/qdev-user.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" #include "qom/object.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 void qdev_create_fake_machine(void) { diff --git a/hw/core/vm-change-state-handler.c b/hw/core/vm-change-state-ha= ndler.c index 99c642b5587..2c111350298 100644 --- a/hw/core/vm-change-state-handler.c +++ b/hw/core/vm-change-state-handler.c @@ -16,7 +16,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "system/runstate.h" =20 static int qdev_get_dev_tree_depth(DeviceState *dev) diff --git a/hw/display/artist.c b/hw/display/artist.c index 5efa9e45ffd..e6fed03786e 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -16,7 +16,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/core/loader.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "ui/console.h" diff --git a/hw/fsi/aspeed_apb2opb.c b/hw/fsi/aspeed_apb2opb.c index 172ba16b0c0..b9d72f3ecf6 100644 --- a/hw/fsi/aspeed_apb2opb.c +++ b/hw/fsi/aspeed_apb2opb.c @@ -13,7 +13,7 @@ #include "trace.h" =20 #include "hw/fsi/aspeed_apb2opb.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 #define TO_REG(x) (x >> 2) =20 diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c index ac024accfcd..deb20d7b6a3 100644 --- a/hw/hyperv/hv-balloon.c +++ b/hw/hyperv/hv-balloon.c @@ -19,7 +19,7 @@ #include "hw/hyperv/vmbus.h" #include "hw/mem/memory-device.h" #include "hw/mem/pc-dimm.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "monitor/qdev.h" #include "qapi/error.h" diff --git a/hw/i2c/i2c_mux_pca954x.c b/hw/i2c/i2c_mux_pca954x.c index a8ef640cd25..fd317f56701 100644 --- a/hw/i2c/i2c_mux_pca954x.c +++ b/hw/i2c/i2c_mux_pca954x.c @@ -19,7 +19,7 @@ #include "hw/i2c/i2c.h" #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_slave.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/log.h" diff --git a/hw/ppc/pnv_homer.c b/hw/ppc/pnv_homer.c index 2208ffe632c..fb394cc6e09 100644 --- a/hw/ppc/pnv_homer.c +++ b/hw/ppc/pnv_homer.c @@ -22,7 +22,7 @@ #include "exec/hwaddr.h" #include "system/memory.h" #include "system/cpus.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" diff --git a/hw/remote/machine.c b/hw/remote/machine.c index e4b47838bad..ced782f6a9c 100644 --- a/hw/remote/machine.c +++ b/hw/remote/machine.c @@ -21,7 +21,7 @@ #include "hw/pci/pci_host.h" #include "hw/remote/iohub.h" #include "hw/remote/iommu.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/remote/vfio-user-obj.h" #include "hw/pci/msi.h" =20 diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c index 3402068ab9e..86192dc8dad 100644 --- a/hw/remote/remote-obj.c +++ b/hw/remote/remote-obj.c @@ -13,7 +13,7 @@ #include "qemu/notify.h" #include "qom/object_interfaces.h" #include "io/channel.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/remote/machine.h" #include "io/channel-util.h" #include "qapi/error.h" diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c index 13cda2f4813..4eb036a5469 100644 --- a/hw/remote/vfio-user-obj.c +++ b/hw/remote/vfio-user-obj.c @@ -54,7 +54,7 @@ #include "qemu/main-loop.h" #include "system/system.h" #include "libvfio-user.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/pci/pci.h" #include "qemu/timer.h" #include "system/memory.h" diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 0d7bbb52aba..2c79522b09a 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -19,7 +19,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/core/fw-path-provider.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/vhost.h" diff --git a/hw/sd/core.c b/hw/sd/core.c index d3c9017445e..3568a81e809 100644 --- a/hw/sd/core.c +++ b/hw/sd/core.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/sd/sd.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c index 984d3d10808..f0c34291dc9 100644 --- a/hw/tpm/tpm_ppi.c +++ b/hw/tpm/tpm_ppi.c @@ -16,7 +16,7 @@ #include "qapi/error.h" #include "system/memory_mapping.h" #include "migration/vmstate.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/acpi/tpm.h" #include "tpm_ppi.h" #include "trace.h" diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index bb5775aa711..32e8615ad3b 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -20,7 +20,7 @@ #include "trace.h" #include "qapi/error.h" #include "system/iommufd.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/vfio/vfio-cpr.h" #include "system/reset.h" #include "qemu/cutils.h" diff --git a/hw/virtio/vdpa-dev.c b/hw/virtio/vdpa-dev.c index 4a7b9709761..57739385a96 100644 --- a/hw/virtio/vdpa-dev.c +++ b/hw/virtio/vdpa-dev.c @@ -19,7 +19,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/cutils.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/vhost.h" diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c index fe95b62d133..e36370e2ee9 100644 --- a/hw/xen/xen_pvdev.c +++ b/hw/xen/xen_pvdev.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/main-loop.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/xen/xen-legacy-backend.h" #include "hw/xen/xen-bus-helper.h" #include "hw/xen/xen_pvdev.h" diff --git a/monitor/hmp.c b/monitor/hmp.c index 34e2b8f748b..f068cc76106 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "monitor-internal.h" #include "monitor/hmp.h" #include "qobject/qdict.h" diff --git a/qom/object.c b/qom/object.c index 4f32c1aba7d..ff8ede8a328 100644 --- a/qom/object.c +++ b/qom/object.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qapi/error.h" #include "qom/object.h" #include "qom/object_interfaces.h" diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c index a00a564b1e2..32e40630c96 100644 --- a/qom/qom-hmp-cmds.c +++ b/qom/qom-hmp-cmds.c @@ -6,7 +6,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "monitor/hmp.h" #include "monitor/monitor.h" #include "qapi/error.h" diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index 57f1898cf61..48b38d2b7f7 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -15,7 +15,7 @@ =20 #include "qemu/osdep.h" #include "block/qdict.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qapi/error.h" #include "qapi/qapi-commands-qdev.h" #include "qapi/qapi-commands-qom.h" diff --git a/stubs/hotplug-stubs.c b/stubs/hotplug-stubs.c index 7aadaa29bd5..23a1678dbbc 100644 --- a/stubs/hotplug-stubs.c +++ b/stubs/hotplug-stubs.c @@ -12,7 +12,7 @@ * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) { diff --git a/stubs/sysbus.c b/stubs/sysbus.c index d8da90caae5..68b771226fa 100644 --- a/stubs/sysbus.c +++ b/stubs/sysbus.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" =20 BusState *sysbus_get_default(void) { diff --git a/system/bootdevice.c b/system/bootdevice.c index 8acdbfb0a57..9538b08983f 100644 --- a/system/bootdevice.c +++ b/system/bootdevice.c @@ -28,7 +28,7 @@ #include "qapi/visitor.h" #include "qemu/error-report.h" #include "system/reset.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/core/boards.h" =20 typedef struct FWBootEntry FWBootEntry; diff --git a/system/physmem.c b/system/physmem.c index edc384f4fa1..ba69be2d082 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -36,7 +36,7 @@ #include "exec/page-protection.h" #include "exec/target_page.h" #include "exec/translation-block.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/qdev-properties.h" #include "hw/core/boards.h" #include "system/xen.h" diff --git a/system/qtest.c b/system/qtest.c index 6cf686a31ec..7c8507fe7cb 100644 --- a/system/qtest.c +++ b/system/qtest.c @@ -19,7 +19,7 @@ #include "system/ioport.h" #include "system/memory.h" #include "exec/tswap.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/core/irq.h" #include "hw/core/cpu.h" #include "qemu/accel.h" diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuz= z.c index c848eec3b93..e8bb7bb0d56 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -22,7 +22,7 @@ #include "string.h" #include "system/memory.h" #include "system/ramblock.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "hw/pci/pci.h" #include "hw/pci/pci_device.h" #include "hw/core/boards.h" diff --git a/ui/console.c b/ui/console.c index 2d00828c538..f445db11389 100644 --- a/ui/console.c +++ b/ui/console.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "ui/console.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "qapi/error.h" #include "qapi/qapi-commands-ui.h" #include "qapi/visitor.h" diff --git a/ui/vdagent.c b/ui/vdagent.c index ddb91e75c64..e2a570a1d8a 100644 --- a/ui/vdagent.c +++ b/ui/vdagent.c @@ -5,7 +5,7 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/units.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "ui/clipboard.h" #include "ui/console.h" #include "ui/input.h" diff --git a/ui/vnc.c b/ui/vnc.c index 0d499b208b9..6d91d1370c6 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -28,7 +28,7 @@ #include "vnc.h" #include "vnc-jobs.h" #include "trace.h" -#include "hw/qdev-core.h" +#include "hw/core/qdev.h" #include "system/system.h" #include "system/runstate.h" #include "qemu/error-report.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764250731; cv=none; d=zohomail.com; s=zohoarc; b=do5tNv+XO7671zxVv8mJ+v+Xm8/RPql+OQ7C+IyYGwdizjvRz/pU+91zFCLWlHvJhQFE+twfOyXBgs65OD5qzHtzyApHZ2xKSX+/qQZawA50lM9Y05Ras+TlMnuVlX2mqTm9mMx3XNQq1f+ye01qnn5a+s/l2D+aRFSFA0jaUoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764250731; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=3uv2XiG+ubsG3OVkhVIfYfHbcOhJw5E0AUVe4KBxbFc=; b=H96HnO65Jnq2Xfboit+SEx2oJaPsRUCzNsxURQmp7yKKfDEZV3oYmTCTTUWCQa77SbEB4oxHTeeLfGUnvkIPngoUzIkA995COEunC3LS4FAdhfHTd4jL34mqU9KJXnHF8xBJUsUAUbdh9jK83+V8CFuBa/cs/eeDNOdk9v2Ejls= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764250731852695.0730874666507; Thu, 27 Nov 2025 05:38:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObrC-0002gF-9a; Thu, 27 Nov 2025 08:16:22 -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 1vObqj-0002eR-EF for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vObqh-0001Gn-UK for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:15:53 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-75-_5tRG2aJOn65SkgEZQPE_w-1; Thu, 27 Nov 2025 08:15:49 -0500 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-b7336ad128cso83612466b.1 for ; Thu, 27 Nov 2025 05:15:49 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f59aece0sm155842466b.32.2025.11.27.05.15.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3uv2XiG+ubsG3OVkhVIfYfHbcOhJw5E0AUVe4KBxbFc=; b=QOso8l0H7YRSyKtpHsHYccMxW1fpNx4RnAK3YqZTKH0asPMO5UgwRLyTOuldkejv4cnQ6m msaD3bNfZ+IEwGX/MeJ8m+3uQOYivE+iViEF923MbXPOIEdLCyKGmQwvww4HT43NFOe5mg BzpIfPRe4VWb0mqFNL3v/YLZF+9tNqo= X-MC-Unique: _5tRG2aJOn65SkgEZQPE_w-1 X-Mimecast-MFC-AGG-ID: _5tRG2aJOn65SkgEZQPE_w_1764249348 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249348; x=1764854148; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3uv2XiG+ubsG3OVkhVIfYfHbcOhJw5E0AUVe4KBxbFc=; b=rRzRSvj2wLOMSFVpruRN3ZCLVrWTw9m/ezUS7TEXy2SUHUdcLMwMpVc2GIdj9fTX3O uBQS5WIDwACj19i4xgeDfW/o50WLYCEbw+zMjPZJ8WN2PjTRkSvVYRVh5vdp4RARzLgX kiACElpR30thkoUxnxeztUAN3axto8b9041ZAAi8jcIU4EPtnTMcynwiWa7IpaRXihPt TRWCbqofgpJQXey1NbzPFMDeAHCeL/Zu6pggaDWj+ENwSh10Wa+WtoUhs4cM9thZ7CP4 IpAf7UdlokvxSP7Mhme+p8lBzxDl58NoLQJ/5z8WoNPtlYdPMgui1A60szBQTAY7Ii5C 6t3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249348; x=1764854148; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=3uv2XiG+ubsG3OVkhVIfYfHbcOhJw5E0AUVe4KBxbFc=; b=f+Hi1dm2a02mJT6NHH30PAic9h3NA4TLGnD4BuuByxOAdtOXKGgXK+lqXk71X0Fx/j YFC20D6di/NhB4H91yd0WK3uqJgrQS7Hc9sMb3z6ky044HipLD/XC4xIyP5VbJUl84mY heomdYjc71b52fzR4jkngb/BxAdsO3xh2RkRZAO0h9mu6SplvNfNQjA4pp6VktuWqdWK YtcmFUURPhodR7ylvu2gsktbY4xdhJk5rPuIFKGvROrcrUQnJ+2sC7l1RSdC7NwW95qY DQ1kLpwffqCE5GNKfsDe0pn+nHwVT6VE2S066OotIhTsZlGCZbj2LF0VWFGR7zO1tqfW BEmA== X-Gm-Message-State: AOJu0Yy2zzC9EHU1Fg3R1FWKVT8pb9VCc5VHuPwJuekPG6546YbAhKZo jRWILNPurC9L8DXn3rDX3p4aiUpiuHYqJsb+AWl0/S9HoDVhFYZ7fig/swN9HygFmiBdcQFjSjU fmKqc1GlUNFKvw3ZJ5jsLRZxnyxPiJ44qWgh+IAPxD7bXHn0YNJFSpoY9EL2jXICGwAP1QEFqhE RqZcKq8r3RhqaZ0Iq0wRzm1Mb6n49TcqQ+41Ta5Oec X-Gm-Gg: ASbGnctU4YZc5lB+2fBmakyzhXMhlOJahTzaA3r8KBMOXp/zk21x9gbM0AFXizqOSIW LzBw1QXkQA5IPIxGpwfWG4VY2i1k6m82shPjQPD7507e3GkPgEvLksDWfLl0xsSwqK3NoIGuC7C //0+wORUw6zws1PtDGSMFhtak6ezZpF3v/JKGnmV4iVIHUSePYFdoPeZz3CY5wgGdor/VU/LJFH kmqQ5Sa/UHM0FgDaxWQKGsdhcJwLtgIZsNUXIxqkYVbCdbUVO1blrxw0VrEhVlvt1ZIMv9SHZgn XhWV1dULRdNMWEnVsLiyNIkjNr5AQoc4Z9mQCeAF5sX3Dcx1HCn1XlGf6+R1U4T/CPAqTkZM6Fm c41IskeOyvDnLfpM8I6cZyJXtCo8jz/pQ+d8sMlhLO7ogUqs4Roj4x07931R08GMj/6evYDMEf7 7QRGiAU+sj5+dj5zw= X-Received: by 2002:a17:907:987:b0:b76:277b:9a58 with SMTP id a640c23a62f3a-b76c546da61mr1109444266b.9.1764249347959; Thu, 27 Nov 2025 05:15:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEzM5dUm/dxui2eaHhubfbxRffet+YIQrV251+pMdW/Di5hVIcVlITn3qfM4B3CQsb5iCsuCg== X-Received: by 2002:a17:907:987:b0:b76:277b:9a58 with SMTP id a640c23a62f3a-b76c546da61mr1109440266b.9.1764249347477; Thu, 27 Nov 2025 05:15:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 18/28] include: move hw/qdev-dma.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:05 +0100 Message-ID: <20251127131516.80807-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764250733200019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- include/hw/{ =3D> core}/qdev-dma.h | 0 hw/usb/hcd-ohci-pci.c | 2 +- hw/usb/hcd-ohci-sysbus.c | 2 +- hw/usb/hcd-ohci.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename include/hw/{ =3D> core}/qdev-dma.h (100%) diff --git a/include/hw/qdev-dma.h b/include/hw/core/qdev-dma.h similarity index 100% rename from include/hw/qdev-dma.h rename to include/hw/core/qdev-dma.h diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index e180e96b5f1..25c400698ee 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -25,7 +25,7 @@ #include "migration/vmstate.h" #include "hw/pci/pci_device.h" #include "hw/sysbus.h" -#include "hw/qdev-dma.h" +#include "hw/core/qdev-dma.h" #include "hw/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c index 5c3434153db..8224fb88628 100644 --- a/hw/usb/hcd-ohci-sysbus.c +++ b/hw/usb/hcd-ohci-sysbus.c @@ -26,7 +26,7 @@ #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "hw/sysbus.h" -#include "hw/qdev-dma.h" +#include "hw/core/qdev-dma.h" #include "hw/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index ea3d5d2bd14..588cecef14d 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -33,7 +33,7 @@ #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "hw/sysbus.h" -#include "hw/qdev-dma.h" +#include "hw/core/qdev-dma.h" #include "hw/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764249523; cv=none; d=zohomail.com; s=zohoarc; b=aHZ+04Iolu5Nd2kGqEFjMQvoKFUvHI4E6Ew/59XLUC0Jgn6VHaMW4dohDpN7MeM9Z3GOjB8RGpO4L+AS5Umut/VZYopP6wv/27Q1Axyor+3qOt/+WObUxsbbHkBGj/fqQ9zw6AGmLi777cFcYmcLI80p1iRN65VzyzW5T+2iYrQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764249523; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=tySLCAazpKjzXw8C+yTh2G1Jlal6Qmte86yH+orrCHU=; b=hTus4m2ZUCHcTnlqzpryezaydyrI+7feCqalArjZDmUpZCydlA6ejX7BrSROudNHMZVM2GWq1loKzhkil3A3EI6Oc4nLtvTAC0fwpkHf4mh03ipoUPTFcu3J88IBq3JiQd28AWOsrqkPMfU2ly/c7gU8mLnqnIuW1gxq6PbFdKQ= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764249523560518.8427122542655; Thu, 27 Nov 2025 05:18:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObsj-0004EG-H6; Thu, 27 Nov 2025 08:17:57 -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 1vObr6-0002jz-OA for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vObqy-0001IS-TQ for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:16 -0500 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-85-koxk0BW9Mh2hvg0RaXTf6Q-1; Thu, 27 Nov 2025 08:15:56 -0500 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-64537824851so1020907a12.1 for ; Thu, 27 Nov 2025 05:15:56 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-64751062261sm1723893a12.33.2025.11.27.05.15.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tySLCAazpKjzXw8C+yTh2G1Jlal6Qmte86yH+orrCHU=; b=b9Arke73//BF6FQMwU6SsVFEWe1gNf2CiiV6OVS0efGmqyLUo70ebYyREN5xNwy6fL1UL3 cRpvo69BAAqxG0TD+92/reV7eMnC3UhlRml4Ysq4+5/Eyfv20M7bJHbateAatYGxTFW1i6 X9oJYViWwiu3jjaW9oaW4KEDDJmA5oQ= X-MC-Unique: koxk0BW9Mh2hvg0RaXTf6Q-1 X-Mimecast-MFC-AGG-ID: koxk0BW9Mh2hvg0RaXTf6Q_1764249356 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249355; x=1764854155; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tySLCAazpKjzXw8C+yTh2G1Jlal6Qmte86yH+orrCHU=; b=d/L7GoQ3ikm7TnsuRDTOZD3ox2svV9t7UvDjF7JoZR1NPPNTRDbyJNM7Lxu1/fdDvX wASKdOHlZsvDHKlkQzeRtIUwLNKkqAGZAH9ITd5+6Lc02B90pLwVy1MG4/SmoUqZA83B eMLcq/+4NVenrJhlfh/HMRpp6IodEX5dwnW6BD0lPlebfqTs9jkGAuNOXBe0Se/bdozy eybwh2nOlV+B/ItahojnNgZrtQ0DCtMovJZ5o3RMRj8cPuuTnGGpjb/9csJyeYRLBW6H foFkrYIeIS8adMFdYIko1imUcVZGZoyiT/BxYoUqgIqD7IUhHrf26kgmMOn+Q9id7LRP 7LRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249355; x=1764854155; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=tySLCAazpKjzXw8C+yTh2G1Jlal6Qmte86yH+orrCHU=; b=a+BXV/D6MRWXvTXihibvr5yceVNZEasxCpWN6iqlYjQrN4qvAs6sFF1+hppbgQgzIL MpYi6IbLxyqKVkgo+n6s7SxucHdW22vwFm6qGwu9P/Eid8/ktdW24HlKs9s1lwJoQ4nt i/PJaE3Vkf2KjkUGWiV5LN5fqWuYdaoRPq70CxTNk7wlD5iCNe4NMemYrfAALdELbceV 0OEkxd3VBgtkfg0/P2VYDHMiwjgw95HbIUdSrrxqM/ObGpMCaoZX9nBAWwWYO3NAHbg9 gQRVnf5D3uH8Od/3U+5KC2xRNBUfOr/BxXjYuo3UluTXnEIRhbRzvYL7KXyS8zsZLRIA eZsg== X-Gm-Message-State: AOJu0YzLLgKSEvYYC78B4UwORKFZrGv3pHP4WC0ai4wIvCfsjGDD86QP +E/vmAd/5CUthvIFWr+ruZzO33AVucy3HhKq21wRPBY7VJjZhgpkenlVoCdkTCgDfa+acgJgMcy +GleXpjCT/nw1ioLgtGvfIZaYNUqPJsYe5bklwth2fexXwuaK2RThpsZdahwVD8Q1mWh5II/xUR cV6Bs8sHB+hgKaWJxBvU+fpr8li7H7uViNmuaJUy2O X-Gm-Gg: ASbGncs8cX2h35+/VyOHSjUKeaDvflvk2N8EnnbKXgdSHr3RXzqZzop6zPmWHL/S/xn WyjHm/dmmBacNaYh8CM0iofI68YlXXHejBTmwVAG5VE9VlXTxja9A4Na2Xwp2o/bUfpX1caQ+RF uYChApTn2tUyVrm92rzkspHIGCGEcS+igUV6ux9trc7p+TIccVFO40Hp+55VrWT7jl5Ud2Ev43J NjlJg9JBDjudGxwMn66h5NZeZdVeYH8I+vwjhYNsGaEbDLjBYA5vb0HVvj6v70SyzQBB2WG6Bxk ydZqAy11stdY9PtoUJAWGvGZ+Sn2oD8w4heAy+Enrt5vUeCv8926EKxiWHcpsTkj/9EjnHnLLnL sB/cFxyk9pt6uP7HrQ79hAFR8a9Tf5nrr8KmbLLshD53LXiFUdc28NLEZNxqs80D2ekKqfuoJQs PMqnoBJeCZOB/YnVE= X-Received: by 2002:a05:6402:5246:b0:640:ca67:848d with SMTP id 4fb4d7f45d1cf-64555b9945fmr20088097a12.8.1764249353285; Thu, 27 Nov 2025 05:15:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IE3VVrIvAQT3Q20IKuHoOslS7EWyHoBuDM/8hqZJrOr5pd2trzvZR4Jr7vjCCH9ASgO/8qKNw== X-Received: by 2002:a05:6402:5246:b0:640:ca67:848d with SMTP id 4fb4d7f45d1cf-64555b9945fmr20087932a12.8.1764249350748; Thu, 27 Nov 2025 05:15:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 19/28] include: move hw/qdev-properties.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:06 +0100 Message-ID: <20251127131516.80807-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764249526254019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- docs/devel/migration/compatibility.rst | 2 +- hw/display/apple-gfx.h | 2 +- hw/riscv/riscv-iommu.h | 2 +- hw/tpm/tpm_prop.h | 2 +- include/hw/char/cadence_uart.h | 2 +- include/hw/char/sifive_uart.h | 2 +- include/hw/{ =3D> core}/qdev-properties.h | 0 include/hw/ide/ide-dev.h | 2 +- include/hw/misc/unimp.h | 2 +- include/hw/net/ne2000-isa.h | 2 +- include/hw/nubus/nubus.h | 2 +- include/hw/qdev-properties-system.h | 2 +- include/hw/timer/i8254.h | 2 +- migration/options.h | 2 +- rust/hw/core/wrapper.h | 2 +- target/riscv/cpu.h | 2 +- backends/spdm-socket.c | 2 +- backends/tpm/tpm_util.c | 2 +- hw/9pfs/virtio-9p-device.c | 2 +- hw/acpi/erst.c | 2 +- hw/acpi/generic_event_device.c | 2 +- hw/acpi/piix4.c | 2 +- hw/acpi/vmclock.c | 2 +- hw/acpi/vmgenid.c | 2 +- hw/adc/aspeed_adc.c | 2 +- hw/adc/npcm7xx_adc.c | 2 +- hw/arm/armv7m.c | 2 +- hw/arm/aspeed_coprocessor_common.c | 2 +- hw/arm/aspeed_soc_common.c | 2 +- hw/arm/b-l475e-iot01a.c | 2 +- hw/arm/bananapi_m2u.c | 2 +- hw/arm/cubieboard.c | 2 +- hw/arm/digic.c | 2 +- hw/arm/exynos4210.c | 2 +- hw/arm/exynos4_boards.c | 2 +- hw/arm/fsl-imx25.c | 2 +- hw/arm/fsl-imx31.c | 2 +- hw/arm/fsl-imx6.c | 2 +- hw/arm/imx25_pdk.c | 2 +- hw/arm/imx8mp-evk.c | 2 +- hw/arm/max78000fthr.c | 2 +- hw/arm/mcimx6ul-evk.c | 2 +- hw/arm/mcimx7d-sabre.c | 2 +- hw/arm/microbit.c | 2 +- hw/arm/mps2.c | 2 +- hw/arm/mps3r.c | 2 +- hw/arm/msf2-som.c | 2 +- hw/arm/musicpal.c | 2 +- hw/arm/netduino2.c | 2 +- hw/arm/netduinoplus2.c | 2 +- hw/arm/npcm7xx.c | 2 +- hw/arm/npcm7xx_boards.c | 2 +- hw/arm/npcm8xx.c | 2 +- hw/arm/npcm8xx_boards.c | 2 +- hw/arm/olimex-stm32-h405.c | 2 +- hw/arm/omap1.c | 2 +- hw/arm/orangepi.c | 2 +- hw/arm/sabrelite.c | 2 +- hw/arm/sbsa-ref.c | 2 +- hw/arm/smmu-common.c | 2 +- hw/arm/smmuv3.c | 2 +- hw/arm/stm32f100_soc.c | 2 +- hw/arm/stm32f205_soc.c | 2 +- hw/arm/stm32vldiscovery.c | 2 +- hw/arm/strongarm.c | 2 +- hw/arm/virt.c | 2 +- hw/audio/ac97.c | 2 +- hw/audio/adlib.c | 2 +- hw/audio/asc.c | 2 +- hw/audio/cs4231a.c | 2 +- hw/audio/gus.c | 2 +- hw/audio/hda-codec.c | 2 +- hw/audio/intel-hda.c | 2 +- hw/audio/marvell_88w8618.c | 2 +- hw/audio/model.c | 2 +- hw/audio/pl041.c | 2 +- hw/audio/sb16.c | 2 +- hw/avr/atmega.c | 2 +- hw/block/fdc-isa.c | 2 +- hw/block/fdc.c | 2 +- hw/block/m25p80.c | 2 +- hw/block/pflash_cfi01.c | 2 +- hw/block/pflash_cfi02.c | 2 +- hw/block/swim.c | 2 +- hw/block/vhost-user-blk.c | 2 +- hw/block/virtio-blk.c | 2 +- hw/block/xen-block.c | 2 +- hw/char/avr_usart.c | 2 +- hw/char/bcm2835_aux.c | 2 +- hw/char/debugcon.c | 2 +- hw/char/digic-uart.c | 2 +- hw/char/diva-gsp.c | 2 +- hw/char/escc.c | 2 +- hw/char/exynos4210_uart.c | 2 +- hw/char/grlib_apbuart.c | 2 +- hw/char/ibex_uart.c | 2 +- hw/char/imx_serial.c | 2 +- hw/char/ipoctal232.c | 2 +- hw/char/max78000_uart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/mchp_pfsoc_mmuart.c | 2 +- hw/char/nrf51_uart.c | 2 +- hw/char/parallel-isa.c | 2 +- hw/char/parallel.c | 2 +- hw/char/pl011.c | 2 +- hw/char/renesas_sci.c | 2 +- hw/char/sclpconsole-lm.c | 2 +- hw/char/sclpconsole.c | 2 +- hw/char/serial-isa.c | 2 +- hw/char/serial-mm.c | 2 +- hw/char/serial-pci-multi.c | 2 +- hw/char/serial-pci.c | 2 +- hw/char/serial.c | 2 +- hw/char/sh_serial.c | 2 +- hw/char/shakti_uart.c | 2 +- hw/char/spapr_vty.c | 2 +- hw/char/stm32f2xx_usart.c | 2 +- hw/char/stm32l4x5_usart.c | 2 +- hw/char/terminal3270.c | 2 +- hw/char/virtio-console.c | 2 +- hw/char/virtio-serial-bus.c | 2 +- hw/char/xen_console.c | 2 +- hw/char/xilinx_uartlite.c | 2 +- hw/core/bus.c | 2 +- hw/core/cpu-common.c | 2 +- hw/core/cpu-system.c | 2 +- hw/core/cpu-user.c | 2 +- hw/core/generic-loader.c | 2 +- hw/core/guest-loader.c | 2 +- hw/core/or-irq.c | 2 +- hw/core/platform-bus.c | 2 +- hw/core/qdev-properties-system.c | 2 +- hw/core/qdev-properties.c | 2 +- hw/core/qdev.c | 2 +- hw/core/split-irq.c | 2 +- hw/cpu/a15mpcore.c | 2 +- hw/cpu/a9mpcore.c | 2 +- hw/cpu/arm11mpcore.c | 2 +- hw/cpu/cluster.c | 2 +- hw/cxl/switch-mailbox-cci.c | 2 +- hw/display/artist.c | 2 +- hw/display/ati.c | 2 +- hw/display/bcm2835_fb.c | 2 +- hw/display/bochs-display.c | 2 +- hw/display/cg3.c | 2 +- hw/display/cirrus_vga.c | 2 +- hw/display/cirrus_vga_isa.c | 2 +- hw/display/dm163.c | 2 +- hw/display/exynos4210_fimd.c | 2 +- hw/display/g364fb.c | 2 +- hw/display/i2c-ddc.c | 2 +- hw/display/macfb.c | 2 +- hw/display/pl110.c | 2 +- hw/display/qxl.c | 2 +- hw/display/ramfb-standalone.c | 2 +- hw/display/sm501.c | 2 +- hw/display/tcx.c | 2 +- hw/display/vga-isa.c | 2 +- hw/display/vga-mmio.c | 2 +- hw/display/vga-pci.c | 2 +- hw/display/vhost-user-gpu.c | 2 +- hw/display/virtio-gpu-gl.c | 2 +- hw/display/virtio-gpu-pci-gl.c | 2 +- hw/display/virtio-gpu-pci-rutabaga.c | 2 +- hw/display/virtio-gpu-pci.c | 2 +- hw/display/virtio-gpu.c | 2 +- hw/display/virtio-vga-gl.c | 2 +- hw/display/virtio-vga-rutabaga.c | 2 +- hw/display/virtio-vga.c | 2 +- hw/display/vmware_vga.c | 2 +- hw/dma/i82374.c | 2 +- hw/dma/i8257.c | 2 +- hw/dma/pl080.c | 2 +- hw/dma/pl330.c | 2 +- hw/dma/sifive_pdma.c | 2 +- hw/dma/sparc32_dma.c | 2 +- hw/dma/xilinx_axidma.c | 2 +- hw/dma/xlnx-zdma.c | 2 +- hw/dma/xlnx_csu_dma.c | 2 +- hw/fsi/cfam.c | 2 +- hw/fsi/lbus.c | 2 +- hw/gpio/imx_gpio.c | 2 +- hw/gpio/npcm7xx_gpio.c | 2 +- hw/gpio/omap_gpio.c | 2 +- hw/gpio/pca9552.c | 2 +- hw/gpio/pca9554.c | 2 +- hw/gpio/pl061.c | 2 +- hw/gpio/sifive_gpio.c | 2 +- hw/gpio/stm32l4x5_gpio.c | 2 +- hw/hyperv/hv-balloon.c | 2 +- hw/hyperv/syndbg.c | 2 +- hw/hyperv/vmbus.c | 2 +- hw/i2c/aspeed_i2c.c | 2 +- hw/i2c/core.c | 2 +- hw/i2c/i2c_mux_pca954x.c | 2 +- hw/i2c/omap_i2c.c | 2 +- hw/i2c/smbus_eeprom.c | 2 +- hw/i386/amd_iommu.c | 2 +- hw/i386/intel_iommu.c | 2 +- hw/i386/kvm/clock.c | 2 +- hw/i386/kvm/ioapic.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/i386/pc_sysfw.c | 2 +- hw/i386/sgx-epc.c | 2 +- hw/i386/vmmouse.c | 2 +- hw/i386/vmport.c | 2 +- hw/i386/x86-iommu.c | 2 +- hw/i386/xen/xen_pvdevice.c | 2 +- hw/ide/ahci-sysbus.c | 2 +- hw/ide/cmd646.c | 2 +- hw/ide/isa.c | 2 +- hw/ide/macio.c | 2 +- hw/ide/mmio.c | 2 +- hw/input/adb.c | 2 +- hw/input/lasips2.c | 2 +- hw/input/pckbd.c | 2 +- hw/input/stellaris_gamepad.c | 2 +- hw/input/virtio-input-hid.c | 2 +- hw/input/virtio-input-host.c | 2 +- hw/input/virtio-input.c | 2 +- hw/intc/apic_common.c | 2 +- hw/intc/arm_gic_common.c | 2 +- hw/intc/arm_gicv2m.c | 2 +- hw/intc/arm_gicv3_common.c | 2 +- hw/intc/arm_gicv3_its.c | 2 +- hw/intc/arm_gicv3_its_kvm.c | 2 +- hw/intc/armv7m_nvic.c | 2 +- hw/intc/exynos4210_combiner.c | 2 +- hw/intc/exynos4210_gic.c | 2 +- hw/intc/goldfish_pic.c | 2 +- hw/intc/grlib_irqmp.c | 2 +- hw/intc/i8259_common.c | 2 +- hw/intc/ioapic.c | 2 +- hw/intc/loongarch_dintc.c | 2 +- hw/intc/loongarch_extioi_common.c | 2 +- hw/intc/loongarch_ipi.c | 2 +- hw/intc/loongarch_pic_common.c | 2 +- hw/intc/loongson_ipi.c | 2 +- hw/intc/loongson_liointc.c | 2 +- hw/intc/m68k_irqc.c | 2 +- hw/intc/mips_gic.c | 2 +- hw/intc/omap_intc.c | 2 +- hw/intc/ompic.c | 2 +- hw/intc/openpic.c | 2 +- hw/intc/openpic_kvm.c | 2 +- hw/intc/pnv_xive.c | 2 +- hw/intc/pnv_xive2.c | 2 +- hw/intc/ppc-uic.c | 2 +- hw/intc/realview_gic.c | 2 +- hw/intc/riscv_aclint.c | 2 +- hw/intc/riscv_aplic.c | 2 +- hw/intc/riscv_imsic.c | 2 +- hw/intc/rx_icu.c | 2 +- hw/intc/s390_flic.c | 2 +- hw/intc/sifive_plic.c | 2 +- hw/intc/spapr_xive.c | 2 +- hw/intc/xics.c | 2 +- hw/intc/xilinx_intc.c | 2 +- hw/intc/xive.c | 2 +- hw/intc/xive2.c | 2 +- hw/intc/xlnx-pmu-iomod-intc.c | 2 +- hw/ipack/ipack.c | 2 +- hw/ipmi/ipmi.c | 2 +- hw/ipmi/ipmi_bmc_extern.c | 2 +- hw/ipmi/ipmi_bmc_sim.c | 2 +- hw/ipmi/isa_ipmi_bt.c | 2 +- hw/ipmi/isa_ipmi_kcs.c | 2 +- hw/isa/isa-superio.c | 2 +- hw/isa/lpc_ich9.c | 2 +- hw/isa/pc87312.c | 2 +- hw/isa/piix.c | 2 +- hw/isa/vt82c686.c | 2 +- hw/m68k/mcf5206.c | 2 +- hw/m68k/mcf_intc.c | 2 +- hw/m68k/next-cube.c | 2 +- hw/m68k/q800-glue.c | 2 +- hw/m68k/virt.c | 2 +- hw/mem/cxl_type3.c | 2 +- hw/mem/nvdimm.c | 2 +- hw/mem/pc-dimm.c | 2 +- hw/mem/sparse-mem.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/mips/boston.c | 2 +- hw/mips/cps.c | 2 +- hw/mips/fuloong2e.c | 2 +- hw/misc/a9scu.c | 2 +- hw/misc/allwinner-h3-dramc.c | 2 +- hw/misc/allwinner-r40-dramc.c | 2 +- hw/misc/allwinner-sid.c | 2 +- hw/misc/allwinner-sramc.c | 2 +- hw/misc/applesmc.c | 2 +- hw/misc/arm11scu.c | 2 +- hw/misc/arm_l2x0.c | 2 +- hw/misc/arm_sysctl.c | 2 +- hw/misc/armsse-cpuid.c | 2 +- hw/misc/aspeed_hace.c | 2 +- hw/misc/aspeed_i3c.c | 2 +- hw/misc/aspeed_lpc.c | 2 +- hw/misc/aspeed_sbc.c | 2 +- hw/misc/aspeed_scu.c | 2 +- hw/misc/aspeed_sdmc.c | 2 +- hw/misc/aspeed_sli.c | 2 +- hw/misc/avr_power.c | 2 +- hw/misc/bcm2835_cprman.c | 2 +- hw/misc/bcm2835_property.c | 2 +- hw/misc/debugexit.c | 2 +- hw/misc/djmemc.c | 2 +- hw/misc/eccmemctl.c | 2 +- hw/misc/empty_slot.c | 2 +- hw/misc/iotkit-secctl.c | 2 +- hw/misc/iotkit-sysctl.c | 2 +- hw/misc/iotkit-sysinfo.c | 2 +- hw/misc/ivshmem-pci.c | 2 +- hw/misc/led.c | 2 +- hw/misc/mac_via.c | 2 +- hw/misc/macio/cuda.c | 2 +- hw/misc/macio/gpio.c | 2 +- hw/misc/macio/macio.c | 2 +- hw/misc/macio/pmu.c | 2 +- hw/misc/max78000_gcr.c | 2 +- hw/misc/mips_cmgcr.c | 2 +- hw/misc/mips_cpc.c | 2 +- hw/misc/mips_itu.c | 2 +- hw/misc/mos6522.c | 2 +- hw/misc/mps2-fpgaio.c | 2 +- hw/misc/mps2-scc.c | 2 +- hw/misc/msf2-sysreg.c | 2 +- hw/misc/npcm7xx_mft.c | 2 +- hw/misc/npcm7xx_pwm.c | 2 +- hw/misc/npcm_gcr.c | 2 +- hw/misc/nrf51_rng.c | 2 +- hw/misc/pci-testdev.c | 2 +- hw/misc/pvpanic-isa.c | 2 +- hw/misc/pvpanic-mmio.c | 2 +- hw/misc/pvpanic-pci.c | 2 +- hw/misc/pvpanic.c | 2 +- hw/misc/sifive_e_aon.c | 2 +- hw/misc/sifive_u_otp.c | 2 +- hw/misc/stm32l4x5_rcc.c | 2 +- hw/misc/tz-mpc.c | 2 +- hw/misc/tz-msc.c | 2 +- hw/misc/tz-ppc.c | 2 +- hw/misc/virt_ctrl.c | 2 +- hw/misc/xlnx-versal-cframe-reg.c | 2 +- hw/misc/xlnx-versal-cfu.c | 2 +- hw/misc/xlnx-versal-crl.c | 2 +- hw/misc/xlnx-versal-pmc-iou-slcr.c | 2 +- hw/misc/xlnx-versal-trng.c | 2 +- hw/misc/xlnx-versal-xramc.c | 2 +- hw/misc/xlnx-zynqmp-apu-ctrl.c | 2 +- hw/misc/zynq_slcr.c | 2 +- hw/net/allwinner-sun8i-emac.c | 2 +- hw/net/allwinner_emac.c | 2 +- hw/net/cadence_gem.c | 2 +- hw/net/can/can_kvaser_pci.c | 2 +- hw/net/can/can_mioe3680_pci.c | 2 +- hw/net/can/can_pcm3680_pci.c | 2 +- hw/net/can/ctucan_pci.c | 2 +- hw/net/can/xlnx-versal-canfd.c | 2 +- hw/net/can/xlnx-zynqmp-can.c | 2 +- hw/net/dp8393x.c | 2 +- hw/net/e1000.c | 2 +- hw/net/e1000e.c | 2 +- hw/net/eepro100.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/net/ftgmac100.c | 2 +- hw/net/i82596.c | 2 +- hw/net/igb.c | 2 +- hw/net/imx_fec.c | 2 +- hw/net/lan9118.c | 2 +- hw/net/lance.c | 2 +- hw/net/lasi_i82596.c | 2 +- hw/net/mcf_fec.c | 2 +- hw/net/msf2-emac.c | 2 +- hw/net/mv88w8618_eth.c | 2 +- hw/net/ne2000-pci.c | 2 +- hw/net/npcm7xx_emc.c | 2 +- hw/net/opencores_eth.c | 2 +- hw/net/pcnet-pci.c | 2 +- hw/net/pcnet.c | 2 +- hw/net/rocker/rocker.c | 2 +- hw/net/rtl8139.c | 2 +- hw/net/smc91c111.c | 2 +- hw/net/spapr_llan.c | 2 +- hw/net/stellaris_enet.c | 2 +- hw/net/sungem.c | 2 +- hw/net/sunhme.c | 2 +- hw/net/tulip.c | 2 +- hw/net/virtio-net.c | 2 +- hw/net/vmxnet3.c | 2 +- hw/net/xen_nic.c | 2 +- hw/net/xgmac.c | 2 +- hw/net/xilinx_axienet.c | 2 +- hw/net/xilinx_ethlite.c | 2 +- hw/nvram/aspeed_otp.c | 2 +- hw/nvram/ds1225y.c | 2 +- hw/nvram/eeprom_at24c.c | 2 +- hw/nvram/fw_cfg.c | 2 +- hw/nvram/mac_nvram.c | 2 +- hw/nvram/nrf51_nvm.c | 2 +- hw/nvram/spapr_nvram.c | 2 +- hw/nvram/xlnx-bbram.c | 2 +- hw/nvram/xlnx-efuse.c | 2 +- hw/nvram/xlnx-versal-efuse-cache.c | 2 +- hw/nvram/xlnx-versal-efuse-ctrl.c | 2 +- hw/nvram/xlnx-zynqmp-efuse.c | 2 +- hw/openrisc/openrisc_sim.c | 2 +- hw/openrisc/virt.c | 2 +- hw/pci-bridge/cxl_downstream.c | 2 +- hw/pci-bridge/cxl_root_port.c | 2 +- hw/pci-bridge/cxl_upstream.c | 2 +- hw/pci-bridge/gen_pcie_root_port.c | 2 +- hw/pci-bridge/pci_bridge_dev.c | 2 +- hw/pci-bridge/pci_expander_bridge.c | 2 +- hw/pci-bridge/pcie_pci_bridge.c | 2 +- hw/pci-bridge/pcie_root_port.c | 2 +- hw/pci-bridge/xio3130_downstream.c | 2 +- hw/pci-host/aspeed_pcie.c | 2 +- hw/pci-host/astro.c | 2 +- hw/pci-host/designware.c | 2 +- hw/pci-host/dino.c | 2 +- hw/pci-host/gpex.c | 2 +- hw/pci-host/grackle.c | 2 +- hw/pci-host/gt64120.c | 2 +- hw/pci-host/i440fx.c | 2 +- hw/pci-host/mv64361.c | 2 +- hw/pci-host/pnv_phb.c | 2 +- hw/pci-host/pnv_phb3.c | 2 +- hw/pci-host/pnv_phb3_msi.c | 2 +- hw/pci-host/pnv_phb4.c | 2 +- hw/pci-host/pnv_phb4_pec.c | 2 +- hw/pci-host/ppce500.c | 2 +- hw/pci-host/q35.c | 2 +- hw/pci-host/raven.c | 2 +- hw/pci-host/remote.c | 2 +- hw/pci-host/sabre.c | 2 +- hw/pci-host/uninorth.c | 2 +- hw/pci-host/versatile.c | 2 +- hw/pci-host/xilinx-pcie.c | 2 +- hw/pci/pci.c | 2 +- hw/pci/pci_bridge.c | 2 +- hw/pci/pci_host.c | 2 +- hw/pci/pcie_port.c | 2 +- hw/pci/pcie_sriov.c | 2 +- hw/ppc/e500.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/pegasos.c | 2 +- hw/ppc/pnv.c | 2 +- hw/ppc/pnv_adu.c | 2 +- hw/ppc/pnv_chiptod.c | 2 +- hw/ppc/pnv_core.c | 2 +- hw/ppc/pnv_homer.c | 2 +- hw/ppc/pnv_i2c.c | 2 +- hw/ppc/pnv_lpc.c | 2 +- hw/ppc/pnv_n1_chiplet.c | 2 +- hw/ppc/pnv_nest_pervasive.c | 2 +- hw/ppc/pnv_occ.c | 2 +- hw/ppc/pnv_pnor.c | 2 +- hw/ppc/pnv_psi.c | 2 +- hw/ppc/pnv_sbe.c | 2 +- hw/ppc/ppc440_bamboo.c | 2 +- hw/ppc/ppc440_uc.c | 2 +- hw/ppc/ppc4xx_devs.c | 2 +- hw/ppc/ppc4xx_sdram.c | 2 +- hw/ppc/prep.c | 2 +- hw/ppc/prep_systemio.c | 2 +- hw/ppc/rs6000_mc.c | 2 +- hw/ppc/sam460ex.c | 2 +- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_cpu_core.c | 2 +- hw/ppc/spapr_irq.c | 2 +- hw/ppc/spapr_nvdimm.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/ppc/spapr_rng.c | 2 +- hw/ppc/spapr_tpm_proxy.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/remote/proxy.c | 2 +- hw/riscv/numa.c | 2 +- hw/riscv/riscv-iommu-pci.c | 2 +- hw/riscv/riscv-iommu-sys.c | 2 +- hw/riscv/riscv-iommu.c | 2 +- hw/riscv/riscv_hart.c | 2 +- hw/riscv/shakti_c.c | 2 +- hw/riscv/virt.c | 2 +- hw/riscv/xiangshan_kmh.c | 2 +- hw/rtc/allwinner-rtc.c | 2 +- hw/rtc/goldfish_rtc.c | 2 +- hw/rtc/m48t59-isa.c | 2 +- hw/rtc/m48t59.c | 2 +- hw/rtc/mc146818rtc.c | 2 +- hw/rtc/pl031.c | 2 +- hw/rtc/rs5c372.c | 2 +- hw/rx/rx62n.c | 2 +- hw/s390x/3270-ccw.c | 2 +- hw/s390x/ccw-device.c | 2 +- hw/s390x/cpu-topology.c | 2 +- hw/s390x/css-bridge.c | 2 +- hw/s390x/css.c | 2 +- hw/s390x/ipl.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/s390-skeys.c | 2 +- hw/s390x/s390-stattrib.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/vhost-scsi-ccw.c | 2 +- hw/s390x/vhost-user-fs-ccw.c | 2 +- hw/s390x/vhost-vsock-ccw.c | 2 +- hw/s390x/virtio-ccw-9p.c | 2 +- hw/s390x/virtio-ccw-balloon.c | 2 +- hw/s390x/virtio-ccw-blk.c | 2 +- hw/s390x/virtio-ccw-crypto.c | 2 +- hw/s390x/virtio-ccw-gpu.c | 2 +- hw/s390x/virtio-ccw-input.c | 2 +- hw/s390x/virtio-ccw-mem.c | 2 +- hw/s390x/virtio-ccw-net.c | 2 +- hw/s390x/virtio-ccw-rng.c | 2 +- hw/s390x/virtio-ccw-scsi.c | 2 +- hw/s390x/virtio-ccw-serial.c | 2 +- hw/scsi/megasas.c | 2 +- hw/scsi/mptsas.c | 2 +- hw/scsi/scsi-bus.c | 2 +- hw/scsi/scsi-disk.c | 2 +- hw/scsi/scsi-generic.c | 2 +- hw/scsi/spapr_vscsi.c | 2 +- hw/scsi/vhost-scsi.c | 2 +- hw/scsi/vhost-user-scsi.c | 2 +- hw/scsi/virtio-scsi.c | 2 +- hw/scsi/vmw_pvscsi.c | 2 +- hw/sd/allwinner-sdhost.c | 2 +- hw/sd/aspeed_sdhci.c | 2 +- hw/sd/sd.c | 2 +- hw/sd/sdhci-pci.c | 2 +- hw/sd/sdhci.c | 2 +- hw/sd/ssi-sd.c | 2 +- hw/sensor/isl_pmbus_vr.c | 2 +- hw/sh4/r2d.c | 2 +- hw/sh4/sh7750.c | 2 +- hw/sparc/leon3.c | 2 +- hw/sparc/sun4m.c | 2 +- hw/sparc/sun4m_iommu.c | 2 +- hw/sparc64/sun4u.c | 2 +- hw/ssi/aspeed_smc.c | 2 +- hw/ssi/ibex_spi_host.c | 2 +- hw/ssi/npcm7xx_fiu.c | 2 +- hw/ssi/pnv_spi.c | 2 +- hw/ssi/sifive_spi.c | 2 +- hw/ssi/ssi.c | 2 +- hw/ssi/xilinx_spi.c | 2 +- hw/ssi/xilinx_spips.c | 2 +- hw/ssi/xlnx-versal-ospi.c | 2 +- hw/timer/a9gtimer.c | 2 +- hw/timer/allwinner-a10-pit.c | 2 +- hw/timer/arm_mptimer.c | 2 +- hw/timer/arm_timer.c | 2 +- hw/timer/aspeed_timer.c | 2 +- hw/timer/avr_timer16.c | 2 +- hw/timer/cmsdk-apb-dualtimer.c | 2 +- hw/timer/grlib_gptimer.c | 2 +- hw/timer/hpet.c | 2 +- hw/timer/ibex_timer.c | 2 +- hw/timer/mss-timer.c | 2 +- hw/timer/npcm7xx_timer.c | 2 +- hw/timer/nrf51_timer.c | 2 +- hw/timer/pxa2xx_timer.c | 2 +- hw/timer/renesas_cmt.c | 2 +- hw/timer/renesas_tmr.c | 2 +- hw/timer/sifive_pwm.c | 2 +- hw/timer/slavio_timer.c | 2 +- hw/timer/sse-timer.c | 2 +- hw/timer/stm32f2xx_timer.c | 2 +- hw/timer/xilinx_timer.c | 2 +- hw/tpm/tpm_crb.c | 2 +- hw/tpm/tpm_spapr.c | 2 +- hw/tpm/tpm_tis_common.c | 2 +- hw/tpm/tpm_tis_isa.c | 2 +- hw/tpm/tpm_tis_sysbus.c | 2 +- hw/tricore/triboard.c | 2 +- hw/tricore/tricore_testdevice.c | 2 +- hw/uefi/var-service-sysbus.c | 2 +- hw/usb/bus.c | 2 +- hw/usb/canokey.c | 2 +- hw/usb/ccid-card-emulated.c | 2 +- hw/usb/ccid-card-passthru.c | 2 +- hw/usb/dev-audio.c | 2 +- hw/usb/dev-hid.c | 2 +- hw/usb/dev-hub.c | 2 +- hw/usb/dev-mtp.c | 2 +- hw/usb/dev-network.c | 2 +- hw/usb/dev-serial.c | 2 +- hw/usb/dev-smartcard-reader.c | 2 +- hw/usb/dev-storage.c | 2 +- hw/usb/dev-uas.c | 2 +- hw/usb/hcd-dwc2.c | 2 +- hw/usb/hcd-dwc3.c | 2 +- hw/usb/hcd-ehci-pci.c | 2 +- hw/usb/hcd-ehci-sysbus.c | 2 +- hw/usb/hcd-ohci-pci.c | 2 +- hw/usb/hcd-ohci-sysbus.c | 2 +- hw/usb/hcd-ohci.c | 2 +- hw/usb/hcd-uhci.c | 2 +- hw/usb/hcd-xhci-nec.c | 2 +- hw/usb/hcd-xhci-pci.c | 2 +- hw/usb/hcd-xhci-sysbus.c | 2 +- hw/usb/hcd-xhci.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/usb/redirect.c | 2 +- hw/usb/u2f-emulated.c | 2 +- hw/usb/u2f-passthru.c | 2 +- hw/usb/xlnx-usb-subsystem.c | 2 +- hw/vfio-user/pci.c | 2 +- hw/vfio/ap.c | 2 +- hw/vfio/ccw.c | 2 +- hw/vfio/pci-quirks.c | 2 +- hw/vfio/pci.c | 2 +- hw/virtio/vdpa-dev-pci.c | 2 +- hw/virtio/vdpa-dev.c | 2 +- hw/virtio/vhost-scsi-pci.c | 2 +- hw/virtio/vhost-user-base.c | 2 +- hw/virtio/vhost-user-blk-pci.c | 2 +- hw/virtio/vhost-user-fs-pci.c | 2 +- hw/virtio/vhost-user-fs.c | 2 +- hw/virtio/vhost-user-gpio-pci.c | 2 +- hw/virtio/vhost-user-gpio.c | 2 +- hw/virtio/vhost-user-i2c-pci.c | 2 +- hw/virtio/vhost-user-i2c.c | 2 +- hw/virtio/vhost-user-rng-pci.c | 2 +- hw/virtio/vhost-user-rng.c | 2 +- hw/virtio/vhost-user-scmi-pci.c | 2 +- hw/virtio/vhost-user-scsi-pci.c | 2 +- hw/virtio/vhost-user-snd-pci.c | 2 +- hw/virtio/vhost-user-snd.c | 2 +- hw/virtio/vhost-user-test-device-pci.c | 2 +- hw/virtio/vhost-user-test-device.c | 2 +- hw/virtio/vhost-user-vsock-pci.c | 2 +- hw/virtio/vhost-user-vsock.c | 2 +- hw/virtio/vhost-vsock-common.c | 2 +- hw/virtio/vhost-vsock-pci.c | 2 +- hw/virtio/vhost-vsock.c | 2 +- hw/virtio/virtio-9p-pci.c | 2 +- hw/virtio/virtio-balloon-pci.c | 2 +- hw/virtio/virtio-balloon.c | 2 +- hw/virtio/virtio-blk-pci.c | 2 +- hw/virtio/virtio-crypto-pci.c | 2 +- hw/virtio/virtio-crypto.c | 2 +- hw/virtio/virtio-input-pci.c | 2 +- hw/virtio/virtio-iommu-pci.c | 2 +- hw/virtio/virtio-iommu.c | 2 +- hw/virtio/virtio-mem.c | 2 +- hw/virtio/virtio-mmio.c | 2 +- hw/virtio/virtio-net-pci.c | 2 +- hw/virtio/virtio-nsm-pci.c | 2 +- hw/virtio/virtio-pci.c | 2 +- hw/virtio/virtio-pmem.c | 2 +- hw/virtio/virtio-rng-pci.c | 2 +- hw/virtio/virtio-rng.c | 2 +- hw/virtio/virtio-scsi-pci.c | 2 +- hw/virtio/virtio-serial-pci.c | 2 +- hw/virtio/virtio.c | 2 +- hw/vmapple/vmapple.c | 2 +- hw/watchdog/cmsdk-apb-watchdog.c | 2 +- hw/watchdog/sbsa_gwdt.c | 2 +- hw/watchdog/wdt_aspeed.c | 2 +- hw/watchdog/wdt_imx2.c | 2 +- hw/xen/xen-bus.c | 2 +- hw/xen/xen-legacy-backend.c | 2 +- hw/xen/xen_pt.c | 2 +- hw/xtensa/xtfpga.c | 2 +- net/net.c | 2 +- system/physmem.c | 2 +- system/qdev-monitor.c | 2 +- system/vl.c | 2 +- target/arm/cpu.c | 2 +- target/arm/cpu64.c | 2 +- target/arm/tcg/cpu64.c | 2 +- target/avr/cpu.c | 2 +- target/hexagon/cpu.c | 2 +- target/i386/cpu-apic.c | 2 +- target/i386/cpu.c | 2 +- target/loongarch/cpu.c | 2 +- target/microblaze/cpu.c | 2 +- target/mips/cpu.c | 2 +- target/ppc/cpu_init.c | 2 +- target/riscv/cpu.c | 2 +- target/s390x/cpu.c | 2 +- target/sparc/cpu.c | 2 +- tests/unit/test-qdev-global-props.c | 2 +- 686 files changed, 685 insertions(+), 685 deletions(-) rename include/hw/{ =3D> core}/qdev-properties.h (100%) diff --git a/docs/devel/migration/compatibility.rst b/docs/devel/migration/= compatibility.rst index ecb887e3184..ce3a1100deb 100644 --- a/docs/devel/migration/compatibility.rst +++ b/docs/devel/migration/compatibility.rst @@ -111,7 +111,7 @@ that array to see what value it needs to get for that f= eature. And what are we going to put in that array, the value of a property. =20 To create a property for a device, we need to use one of the -DEFINE_PROP_*() macros. See include/hw/qdev-properties.h to find the +DEFINE_PROP_*() macros. See include/hw/core/qdev-properties.h to find the macros that exist. With it, we set the default value for that property, and that is what it is going to get in the latest released version. But if we want a different value for a previous version, we diff --git a/hw/display/apple-gfx.h b/hw/display/apple-gfx.h index a8b1d1efc09..3197bd853da 100644 --- a/hw/display/apple-gfx.h +++ b/hw/display/apple-gfx.h @@ -10,7 +10,7 @@ =20 #include "qemu/queue.h" #include "system/memory.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "ui/surface.h" =20 #define TYPE_APPLE_GFX_MMIO "apple-gfx-mmio" diff --git a/hw/riscv/riscv-iommu.h b/hw/riscv/riscv-iommu.h index a31aa62144f..2dabd86941b 100644 --- a/hw/riscv/riscv-iommu.h +++ b/hw/riscv/riscv-iommu.h @@ -20,7 +20,7 @@ #define HW_RISCV_IOMMU_STATE_H =20 #include "qom/object.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/dma.h" #include "hw/riscv/iommu.h" #include "hw/riscv/riscv-iommu-bits.h" diff --git a/hw/tpm/tpm_prop.h b/hw/tpm/tpm_prop.h index c4df74805a7..876f5c80fcd 100644 --- a/hw/tpm/tpm_prop.h +++ b/hw/tpm/tpm_prop.h @@ -23,7 +23,7 @@ #define HW_TPM_PROP_H =20 #include "system/tpm_backend.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 extern const PropertyInfo qdev_prop_tpm; =20 diff --git a/include/hw/char/cadence_uart.h b/include/hw/char/cadence_uart.h index c87c327357f..ad09fbdf32c 100644 --- a/include/hw/char/cadence_uart.h +++ b/include/hw/char/cadence_uart.h @@ -19,7 +19,7 @@ #ifndef CADENCE_UART_H #define CADENCE_UART_H =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qapi/error.h" diff --git a/include/hw/char/sifive_uart.h b/include/hw/char/sifive_uart.h index 6486c3f4a5d..dea6055f872 100644 --- a/include/hw/char/sifive_uart.h +++ b/include/hw/char/sifive_uart.h @@ -21,7 +21,7 @@ #define HW_SIFIVE_UART_H =20 #include "chardev/char-fe.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qom/object.h" #include "qemu/fifo8.h" diff --git a/include/hw/qdev-properties.h b/include/hw/core/qdev-properties= .h similarity index 100% rename from include/hw/qdev-properties.h rename to include/hw/core/qdev-properties.h diff --git a/include/hw/ide/ide-dev.h b/include/hw/ide/ide-dev.h index 92e88687800..617e8159c77 100644 --- a/include/hw/ide/ide-dev.h +++ b/include/hw/ide/ide-dev.h @@ -21,7 +21,7 @@ #define IDE_DEV_H =20 #include "system/dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/block/block.h" =20 typedef struct IDEDevice IDEDevice; diff --git a/include/hw/misc/unimp.h b/include/hw/misc/unimp.h index 518d627dc5d..904f502fab1 100644 --- a/include/hw/misc/unimp.h +++ b/include/hw/misc/unimp.h @@ -8,7 +8,7 @@ #ifndef HW_MISC_UNIMP_H #define HW_MISC_UNIMP_H =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "qom/object.h" diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h index 73bae10ad1a..1e14d1afc0b 100644 --- a/include/hw/net/ne2000-isa.h +++ b/include/hw/net/ne2000-isa.h @@ -11,7 +11,7 @@ #define HW_NET_NE2000_ISA_H =20 #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "net/net.h" #include "qapi/error.h" =20 diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h index 7825840dcac..105ddddd0d8 100644 --- a/include/hw/nubus/nubus.h +++ b/include/hw/nubus/nubus.h @@ -9,7 +9,7 @@ #ifndef HW_NUBUS_NUBUS_H #define HW_NUBUS_NUBUS_H =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "system/address-spaces.h" #include "qom/object.h" diff --git a/include/hw/qdev-properties-system.h b/include/hw/qdev-properti= es-system.h index 45687be005f..ec39ef3bd6e 100644 --- a/include/hw/qdev-properties-system.h +++ b/include/hw/qdev-properties-system.h @@ -1,7 +1,7 @@ #ifndef HW_QDEV_PROPERTIES_SYSTEM_H #define HW_QDEV_PROPERTIES_SYSTEM_H =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 bool qdev_prop_sanitize_s390x_loadparm(uint8_t *loadparm, const char *str, Error **errp); diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index f7148d92865..65775b789df 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -25,7 +25,7 @@ #ifndef HW_I8254_H #define HW_I8254_H =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/isa/isa.h" #include "qapi/error.h" #include "qom/object.h" diff --git a/migration/options.h b/migration/options.h index a7b3262d1ed..d6f1742e5b9 100644 --- a/migration/options.h +++ b/migration/options.h @@ -14,7 +14,7 @@ #ifndef QEMU_MIGRATION_OPTIONS_H #define QEMU_MIGRATION_OPTIONS_H =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/client-options.h" =20 diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h index 44f8583bff9..8fda78924d8 100644 --- a/rust/hw/core/wrapper.h +++ b/rust/hw/core/wrapper.h @@ -27,6 +27,6 @@ typedef enum memory_order { #include "hw/sysbus.h" #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/core/irq.h" diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 36e7f100374..b54cd78f8f7 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -22,7 +22,7 @@ =20 #include "hw/core/cpu.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" diff --git a/backends/spdm-socket.c b/backends/spdm-socket.c index 6d8f02d3b92..07aea375165 100644 --- a/backends/spdm-socket.c +++ b/backends/spdm-socket.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "system/spdm-socket.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/core/qdev-prop-internal.h" =20 diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c index f2d1739e336..a64e156f45f 100644 --- a/backends/tpm/tpm_util.c +++ b/backends/tpm/tpm_util.c @@ -26,7 +26,7 @@ #include "qapi/visitor.h" #include "tpm_int.h" #include "system/memory.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/tpm_backend.h" #include "system/tpm_util.h" #include "trace.h" diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 81b91e47c63..9f70e2338cd 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -22,7 +22,7 @@ #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" #include "coth.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "qemu/iov.h" #include "qemu/module.h" diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c index 10bbe37c170..b6c1942e308 100644 --- a/hw/acpi/erst.c +++ b/hw/acpi/erst.c @@ -18,7 +18,7 @@ #include "qom/object_interfaces.h" #include "qemu/error-report.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/acpi/acpi.h" #include "hw/acpi/acpi-defs.h" #include "hw/acpi/aml-build.h" diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c index 675ec43d094..6741f46723c 100644 --- a/hw/acpi/generic_event_device.c +++ b/hw/acpi/generic_event_device.c @@ -19,7 +19,7 @@ #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "system/runstate.h" diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 1e3c6345411..19d4d4be932 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -24,7 +24,7 @@ #include "hw/isa/apm.h" #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/acpi/acpi.h" #include "hw/acpi/pcihp.h" #include "hw/acpi/piix4.h" diff --git a/hw/acpi/vmclock.c b/hw/acpi/vmclock.c index c582c0c1f83..55c9f950662 100644 --- a/hw/acpi/vmclock.c +++ b/hw/acpi/vmclock.c @@ -17,7 +17,7 @@ #include "hw/acpi/aml-build.h" #include "hw/acpi/vmclock.h" #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "system/reset.h" diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index 33c35c85dd4..fcf9a94daf1 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -17,7 +17,7 @@ #include "hw/acpi/aml-build.h" #include "hw/acpi/vmgenid.h" #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "system/reset.h" diff --git a/hw/adc/aspeed_adc.c b/hw/adc/aspeed_adc.c index 564979f24dd..fd3af308296 100644 --- a/hw/adc/aspeed_adc.c +++ b/hw/adc/aspeed_adc.c @@ -12,7 +12,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/adc/aspeed_adc.h" #include "trace.h" diff --git a/hw/adc/npcm7xx_adc.c b/hw/adc/npcm7xx_adc.c index 4494d5558f0..44079791cbd 100644 --- a/hw/adc/npcm7xx_adc.c +++ b/hw/adc/npcm7xx_adc.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "hw/adc/npcm7xx_adc.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index d9c7bcbcd71..844d620286c 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -13,7 +13,7 @@ #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "elf.h" #include "system/reset.h" diff --git a/hw/arm/aspeed_coprocessor_common.c b/hw/arm/aspeed_coprocessor= _common.c index f037d5b573f..a0a4c73d08d 100644 --- a/hw/arm/aspeed_coprocessor_common.c +++ b/hw/arm/aspeed_coprocessor_common.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "system/memory.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/aspeed_coprocessor.h" =20 static void aspeed_coprocessor_realize(DeviceState *dev, Error **errp) diff --git a/hw/arm/aspeed_soc_common.c b/hw/arm/aspeed_soc_common.c index 84e6458e80a..fd08793575a 100644 --- a/hw/arm/aspeed_soc_common.c +++ b/hw/arm/aspeed_soc_common.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/unimp.h" #include "hw/arm/aspeed_soc.h" #include "hw/char/serial-mm.h" diff --git a/hw/arm/b-l475e-iot01a.c b/hw/arm/b-l475e-iot01a.c index a724b5fdb20..ee789c8df94 100644 --- a/hw/arm/b-l475e-iot01a.c +++ b/hw/arm/b-l475e-iot01a.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/core/split-irq.h" diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c index fd347e18d26..9b468cd8ac8 100644 --- a/hw/arm/bananapi_m2u.c +++ b/hw/arm/bananapi_m2u.c @@ -24,7 +24,7 @@ #include "qemu/error-report.h" #include "hw/core/boards.h" #include "hw/i2c/i2c.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/allwinner-r40.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index 9fe282342ab..a643ae4e27d 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -19,7 +19,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/allwinner-a10.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/digic.c b/hw/arm/digic.c index d831bc974d2..5dfa5839a61 100644 --- a/hw/arm/digic.c +++ b/hw/arm/digic.c @@ -24,7 +24,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/arm/digic.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/system.h" =20 #define DIGIC4_TIMER_BASE(n) (0xc0210000 + (n) * 0x100) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 992edd3ba89..5d68579cd6b 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -32,7 +32,7 @@ #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/exynos4210.h" #include "hw/sd/sdhci.h" #include "hw/usb/hcd-ehci.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index f07dd452fcb..e8c171f40a8 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -32,7 +32,7 @@ #include "system/address-spaces.h" #include "hw/arm/exynos4210.h" #include "hw/net/lan9118.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "hw/core/irq.h" #include "target/arm/cpu-qom.h" diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 7aad6359ea8..dd670827ff7 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx25.h" #include "system/system.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "chardev/char.h" #include "target/arm/cpu-qom.h" =20 diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c index e9f70ad94b8..190f863355d 100644 --- a/hw/arm/fsl-imx31.c +++ b/hw/arm/fsl-imx31.c @@ -24,7 +24,7 @@ #include "hw/arm/fsl-imx31.h" #include "system/system.h" #include "system/address-spaces.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "chardev/char.h" #include "target/arm/cpu-qom.h" =20 diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 50b34139fa2..f3aa1d81501 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -25,7 +25,7 @@ #include "hw/misc/unimp.h" #include "hw/usb/imx-usb-phy.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/system.h" #include "chardev/char.h" #include "qemu/error-report.h" diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index 21860ed14d3..7ebd6c8eb9c 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/fsl-imx25.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index ed8c52e1bd2..0af5aad5835 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -12,7 +12,7 @@ #include "hw/arm/fsl-imx8mp.h" #include "hw/arm/machines-qom.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/kvm.h" #include "system/qtest.h" #include "qemu/error-report.h" diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c index 4b6e76e46bb..ed50bb91979 100644 --- a/hw/arm/max78000fthr.c +++ b/hw/arm/max78000fthr.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/max78000_soc.h" diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 5fe6526ba0a..6e9d92b1f1d 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -16,7 +16,7 @@ #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" =20 diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index b1b56b920d4..a0ac647c3df 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -18,7 +18,7 @@ #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" =20 diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index cd035fffc76..9d5c4898469 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -18,7 +18,7 @@ =20 #include "hw/arm/nrf51_soc.h" #include "hw/i2c/microbit_i2c.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" =20 struct MicrobitMachineState { diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index 7d2efc703bd..ac9366d8447 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -36,7 +36,7 @@ #include "hw/core/boards.h" #include "system/address-spaces.h" #include "system/system.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/unimp.h" #include "hw/char/cmsdk-apb-uart.h" #include "hw/timer/cmsdk-apb-timer.h" diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index 77a0c0b7aff..2d64a198c42 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -34,7 +34,7 @@ #include "hw/core/boards.h" #include "hw/core/or-irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/bsa.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 10382f0d3b2..caf6e7e1ad7 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -30,7 +30,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "hw/core/qdev-clock.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index a4ddc0d08f9..39e8f69cae0 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -22,7 +22,7 @@ #include "hw/char/serial-mm.h" #include "qemu/timer.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/block/flash.h" #include "ui/console.h" #include "hw/i2c/i2c.h" diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index c9281059365..c32deaf43ba 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/stm32f205_soc.h" diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index d64d2aefe46..a90dcbe8c26 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/stm32f405_soc.h" diff --git a/hw/arm/npcm7xx.c b/hw/arm/npcm7xx.c index 6905e1d8a7d..c2bbcd89dbc 100644 --- a/hw/arm/npcm7xx.c +++ b/hw/arm/npcm7xx.c @@ -22,7 +22,7 @@ #include "hw/core/loader.h" #include "hw/misc/unimp.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "exec/tswap.h" #include "qemu/units.h" diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index 729306b33c5..57a8d3186e6 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -24,7 +24,7 @@ #include "hw/core/loader.h" #include "hw/nvram/eeprom_at24c.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/datadir.h" #include "qemu/units.h" diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c index 71e47dac2e1..9ce6ea52d97 100644 --- a/hw/arm/npcm8xx.c +++ b/hw/arm/npcm8xx.c @@ -25,7 +25,7 @@ #include "hw/core/loader.h" #include "hw/misc/unimp.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/units.h" #include "system/system.h" diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c index 7252edf3dcb..042a928857c 100644 --- a/hw/arm/npcm8xx_boards.c +++ b/hw/arm/npcm8xx_boards.c @@ -23,7 +23,7 @@ #include "hw/core/cpu.h" #include "hw/core/loader.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/datadir.h" diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c index 1a08d742155..e801e4308ed 100644 --- a/hw/arm/olimex-stm32-h405.c +++ b/hw/arm/olimex-stm32-h405.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/stm32f405_soc.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 994e5a919e1..fcba6eb52d5 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -26,7 +26,7 @@ #include "system/address-spaces.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" #include "hw/sd/sd.h" diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index c0dd32f13ce..d84443bb7b3 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -23,7 +23,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/allwinner-h3.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index 99cbd5e2fea..db5669c5c24 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -16,7 +16,7 @@ #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" =20 diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 5f0fb16a54c..d86b4706869 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -44,7 +44,7 @@ #include "hw/intc/arm_gicv3_its_common.h" #include "hw/core/loader.h" #include "hw/pci-host/gpex.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "hw/usb/xhci.h" #include "hw/char/pl011.h" diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 62a76121841..e1b77cc55fc 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -21,7 +21,7 @@ #include "exec/target_page.h" #include "hw/core/cpu.h" #include "hw/pci/pci_bridge.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/jhash.h" #include "qemu/module.h" diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index e391842dc33..e12a64a20fb 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -21,7 +21,7 @@ #include "hw/core/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev.h" #include "hw/pci/pci.h" #include "cpu.h" diff --git a/hw/arm/stm32f100_soc.c b/hw/arm/stm32f100_soc.c index 8d61be72c48..2358368dbab 100644 --- a/hw/arm/stm32f100_soc.c +++ b/hw/arm/stm32f100_soc.c @@ -29,7 +29,7 @@ #include "hw/arm/boot.h" #include "system/address-spaces.h" #include "hw/arm/stm32f100_soc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" #include "system/system.h" diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index 406f614f1d5..a03c6b40025 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -28,7 +28,7 @@ #include "hw/arm/boot.h" #include "system/address-spaces.h" #include "hw/arm/stm32f205_soc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "system/system.h" =20 diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index e7e1b8200e1..8f93c0036a3 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/stm32f100_soc.h" diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 95dda078522..3ee73ee4594 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -29,7 +29,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0d2652e6dbc..d8773cb541f 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -63,7 +63,7 @@ #include "hw/virtio/virtio-pci.h" #include "hw/core/sysbus-fdt.h" #include "hw/core/platform-bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/fdt.h" #include "hw/intc/arm_gic.h" #include "hw/intc/arm_gicv3_common.h" diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 60daa62ea33..0694f0adf9c 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -21,7 +21,7 @@ #include "hw/audio/model.h" #include "qemu/audio.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "system/dma.h" diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 19d3a5f1280..8b9fe53e17b 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -28,7 +28,7 @@ #include "hw/audio/model.h" #include "qemu/audio.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/error-report.h" #include "qom/object.h" =20 diff --git a/hw/audio/asc.c b/hw/audio/asc.c index b6f42045003..77a5cc1092d 100644 --- a/hw/audio/asc.c +++ b/hw/audio/asc.c @@ -17,7 +17,7 @@ #include "hw/core/irq.h" #include "qemu/audio.h" #include "hw/audio/asc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" =20 diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index 8368172f401..7489cf42b7d 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -27,7 +27,7 @@ #include "qemu/audio.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/error-report.h" diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 6c41b25486e..69ddc419191 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -29,7 +29,7 @@ #include "qemu/audio.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "gusemu.h" #include "qemu/error-report.h" diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index e90c9de046e..6445d227594 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "intel-hda.h" #include "migration/vmstate.h" #include "qemu/host-utils.h" diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index 758e130c938..d7c2c3c2fd4 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/msi.h" #include "monitor/qdev.h" #include "qemu/timer.h" diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index ba9bd6befd7..39f4b4514dc 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -14,7 +14,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/audio/wm8750.h" #include "qemu/audio.h" #include "qapi/error.h" diff --git a/hw/audio/model.c b/hw/audio/model.c index ff4e4b24528..86a5419b09e 100644 --- a/hw/audio/model.c +++ b/hw/audio/model.c @@ -26,7 +26,7 @@ #include "monitor/qdev.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/audio/model.h" =20 struct audio_model { diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c index 7bb2c81afcd..117b6b0ae65 100644 --- a/hw/audio/pl041.c +++ b/hw/audio/pl041.c @@ -22,7 +22,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index 6ca31a0e649..3c5beb9dfa3 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -27,7 +27,7 @@ #include "qemu/audio.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/error-report.h" diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c index 95b6da5e343..b185295d551 100644 --- a/hw/avr/atmega.c +++ b/hw/avr/atmega.c @@ -16,7 +16,7 @@ #include "system/memory.h" #include "system/address-spaces.h" #include "system/system.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qom/object.h" #include "hw/misc/unimp.h" diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index 0034c3594ae..ebb3d2f7cd8 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -35,7 +35,7 @@ #include "hw/acpi/acpi_aml_interface.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/block/block.h" diff --git a/hw/block/fdc.c b/hw/block/fdc.c index e0e53ba0382..1747f6506fd 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -35,7 +35,7 @@ #include "qemu/memalign.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/block/block.h" diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index a5336d92ff9..648e6bdc008 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -26,7 +26,7 @@ #include "system/block-backend.h" #include "hw/block/block.h" #include "hw/block/flash.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/ssi/ssi.h" #include "migration/vmstate.h" diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 168101d8dfe..f93b812c024 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -39,7 +39,7 @@ #include "qemu/osdep.h" #include "hw/block/block.h" #include "hw/block/flash.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "system/block-backend.h" #include "qapi/error.h" diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 3244b699b98..6a74bcb7a1b 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -35,7 +35,7 @@ #include "qemu/osdep.h" #include "hw/block/block.h" #include "hw/block/flash.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/block/swim.c b/hw/block/swim.c index ad047362f88..53ba7fa59cf 100644 --- a/hw/block/swim.c +++ b/hw/block/swim.c @@ -18,7 +18,7 @@ #include "migration/vmstate.h" #include "hw/block/block.h" #include "hw/block/swim.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" =20 =20 diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index b399eab51a1..62295f187ca 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -21,7 +21,7 @@ #include "qemu/error-report.h" #include "qemu/cutils.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/virtio-blk-common.h" #include "hw/virtio/vhost.h" diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 64efce48462..ddf0e9ee53e 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -21,7 +21,7 @@ #include "block/block_int.h" #include "trace.h" #include "hw/block/block.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/blockdev.h" #include "system/block-ram-registrar.h" #include "system/system.h" diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 74de897c798..5dc4ba9d076 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -20,7 +20,7 @@ #include "qobject/qstring.h" #include "qom/object_interfaces.h" #include "hw/block/xen_blkif.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/xen/xen-block.h" #include "hw/xen/xen-backend.h" #include "system/blockdev.h" diff --git a/hw/char/avr_usart.c b/hw/char/avr_usart.c index e98ad53e447..c3515b6f7d0 100644 --- a/hw/char/avr_usart.c +++ b/hw/char/avr_usart.c @@ -23,7 +23,7 @@ #include "hw/char/avr_usart.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" =20 static int avr_usart_can_receive(void *opaque) diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c index 03428efeea8..47e24c5bba1 100644 --- a/hw/char/bcm2835_aux.c +++ b/hw/char/bcm2835_aux.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "hw/char/bcm2835_aux.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c index bb323adda55..36607d0c1c7 100644 --- a/hw/char/debugcon.c +++ b/hw/char/debugcon.c @@ -29,7 +29,7 @@ #include "qemu/module.h" #include "chardev/char-fe.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qom/object.h" =20 diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c index 0f6af51bb7b..04dec0df8a6 100644 --- a/hw/char/digic-uart.c +++ b/hw/char/digic-uart.c @@ -34,7 +34,7 @@ #include "qemu/module.h" =20 #include "hw/char/digic-uart.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" =20 enum { diff --git a/hw/char/diva-gsp.c b/hw/char/diva-gsp.c index 835594e5cb6..1dafc1e80c3 100644 --- a/hw/char/diva-gsp.c +++ b/hw/char/diva-gsp.c @@ -20,7 +20,7 @@ #include "hw/char/serial.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" =20 diff --git a/hw/char/escc.c b/hw/char/escc.c index 27269dca643..496bbc56dea 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index 8ba310fd7ac..387156d5e34 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -31,7 +31,7 @@ =20 #include "hw/arm/exynos4210.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" =20 #include "trace.h" diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index 15925eb2e63..9731e664c1b 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -26,7 +26,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/char/grlib_uart.h" #include "hw/sysbus.h" diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c index 23abeacb1b5..ac4a43af84e 100644 --- a/hw/char/ibex_uart.c +++ b/hw/char/ibex_uart.c @@ -29,7 +29,7 @@ #include "hw/char/ibex_uart.h" #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/registerfields.h" #include "migration/vmstate.h" diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index 9f13236f29c..78d2c25f86f 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "hw/char/imx_serial.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 6e38916150c..19f312b9d30 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "hw/ipack/ipack.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/bitops.h" diff --git a/hw/char/max78000_uart.c b/hw/char/max78000_uart.c index 5fc933123e9..59ec24a15e8 100644 --- a/hw/char/max78000_uart.c +++ b/hw/char/max78000_uart.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/char/max78000_uart.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index d9d551924b3..391674dbcc6 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -12,7 +12,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "hw/m68k/mcf.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "chardev/char-fe.h" #include "qom/object.h" diff --git a/hw/char/mchp_pfsoc_mmuart.c b/hw/char/mchp_pfsoc_mmuart.c index 6149f9d2047..6673721454c 100644 --- a/hw/char/mchp_pfsoc_mmuart.c +++ b/hw/char/mchp_pfsoc_mmuart.c @@ -25,7 +25,7 @@ #include "qapi/error.h" #include "migration/vmstate.h" #include "hw/char/mchp_pfsoc_mmuart.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #define REGS_OFFSET 0x20 =20 diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c index 39d144538d1..6087cabeb3c 100644 --- a/hw/char/nrf51_uart.c +++ b/hw/char/nrf51_uart.c @@ -17,7 +17,7 @@ #include "qemu/module.h" #include "hw/char/nrf51_uart.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c index b6dfb6cc31a..92e94138f4a 100644 --- a/hw/char/parallel-isa.c +++ b/hw/char/parallel-isa.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "system/system.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/char/parallel-isa.h" #include "hw/char/parallel.h" #include "qapi/error.h" diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 8732e4e9f96..6708d7658bd 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -28,7 +28,7 @@ #include "qemu/module.h" #include "chardev/char-parallel.h" #include "hw/acpi/acpi_aml_interface.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/char/parallel-isa.h" diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 030d6a2e8b4..f37ffd349f6 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -24,7 +24,7 @@ #include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "chardev/char-fe.h" diff --git a/hw/char/renesas_sci.c b/hw/char/renesas_sci.c index b32e41d5b8a..3c1cc43954b 100644 --- a/hw/char/renesas_sci.c +++ b/hw/char/renesas_sci.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "hw/core/irq.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/char/renesas_sci.h" #include "migration/vmstate.h" diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index c51308f9c5c..ed08cf42da2 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -22,7 +22,7 @@ #include "hw/s390x/sclp.h" #include "migration/vmstate.h" #include "hw/s390x/event-facility.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/s390x/ebcdic.h" #include "qom/object.h" diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index 2abf861dbcf..ab444fe1fa4 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -19,7 +19,7 @@ =20 #include "hw/s390x/sclp.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/s390x/event-facility.h" #include "chardev/char-fe.h" diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index 0ea59a3d5c2..a4be0492c59 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -31,7 +31,7 @@ #include "hw/char/serial.h" #include "hw/char/serial-isa.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qom/object.h" =20 diff --git a/hw/char/serial-mm.c b/hw/char/serial-mm.c index 13aba780ec5..6e963e581f9 100644 --- a/hw/char/serial-mm.c +++ b/hw/char/serial-mm.c @@ -28,7 +28,7 @@ #include "exec/cpu-common.h" #include "migration/vmstate.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 static uint64_t serial_mm_read(void *opaque, hwaddr addr, unsigned size) { diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c index 34608569988..f0af12c14f9 100644 --- a/hw/char/serial-pci-multi.c +++ b/hw/char/serial-pci-multi.c @@ -32,7 +32,7 @@ #include "hw/char/serial.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" =20 diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index d05d0898998..d8cacc90859 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -31,7 +31,7 @@ #include "hw/char/serial.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qom/object.h" =20 diff --git a/hw/char/serial.c b/hw/char/serial.c index 11685b397b7..cbff68a7111 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -35,7 +35,7 @@ #include "system/runstate.h" #include "qemu/error-report.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" =20 #define UART_LCR_DLAB 0x80 /* Divisor latch access bit */ diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 008a2ea2f04..9cd79fce334 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -29,7 +29,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sh4/sh.h" #include "chardev/char-fe.h" diff --git a/hw/char/shakti_uart.c b/hw/char/shakti_uart.c index 6e216edb0fc..51e45351d95 100644 --- a/hw/char/shakti_uart.c +++ b/hw/char/shakti_uart.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/char/shakti_uart.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/log.h" =20 diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index 766b2bfcac0..17a17c47c36 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -6,7 +6,7 @@ #include "chardev/char-fe.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qom/object.h" =20 diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c index 49bbda03b87..2c19ec69cc8 100644 --- a/hw/char/stm32f2xx_usart.c +++ b/hw/char/stm32f2xx_usart.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/char/stm32f2xx_usart.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c index 4533cbc93be..8b208ba9b6a 100644 --- a/hw/char/stm32l4x5_usart.c +++ b/hw/char/stm32l4x5_usart.c @@ -26,7 +26,7 @@ #include "hw/core/clock.h" #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/registerfields.h" #include "trace.h" diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index c993f67b42a..821a75c37a2 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -15,7 +15,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "chardev/char-fe.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/s390x/3270-ccw.h" #include "qom/object.h" diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 1b669c9be83..8c2a6a9d1d3 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -15,7 +15,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/virtio-serial.h" #include "qapi/error.h" diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 673c50f0be0..5ec5f5313b2 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -27,7 +27,7 @@ #include "monitor/monitor.h" #include "qemu/error-report.h" #include "qemu/queue.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "hw/virtio/virtio-serial.h" #include "hw/virtio/virtio-access.h" diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index a639fb0b114..a0d142582ee 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -29,7 +29,7 @@ #include "chardev/char-fe.h" #include "hw/xen/xen-backend.h" #include "hw/xen/xen-bus-helper.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/xen/interface/io/console.h" #include "hw/xen/interface/io/xs_wire.h" diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index da1ecd249c7..9d81cd904c6 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "hw/char/xilinx_uartlite.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/core/bus.c b/hw/core/bus.c index bddfc22d388..53f392fdda8 100644 --- a/hw/core/bus.c +++ b/hw/core/bus.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/ctype.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index fb8421184d5..2e925880afa 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -32,7 +32,7 @@ #include "exec/gdbstub.h" #include "system/tcg.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #ifdef CONFIG_PLUGIN #include "qemu/plugin.h" diff --git a/hw/core/cpu-system.c b/hw/core/cpu-system.c index 5d5a4357399..48c8ddf4b15 100644 --- a/hw/core/cpu-system.c +++ b/hw/core/cpu-system.c @@ -25,7 +25,7 @@ #include "system/memory.h" #include "qemu/target-info.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/sysemu-cpu-ops.h" #include "migration/vmstate.h" #include "system/tcg.h" diff --git a/hw/core/cpu-user.c b/hw/core/cpu-user.c index 270afe5b9f6..25aa25ad240 100644 --- a/hw/core/cpu-user.c +++ b/hw/core/cpu-user.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/cpu.h" #include "migration/vmstate.h" =20 diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 590c6a8131a..24f3908b1cc 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -35,7 +35,7 @@ #include "system/reset.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" #include "hw/core/generic-loader.h" diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c index e46897c4974..38cb9f992cb 100644 --- a/hw/core/guest-loader.c +++ b/hw/core/guest-loader.c @@ -28,7 +28,7 @@ #include "hw/core/cpu.h" #include "system/dma.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" #include "guest-loader.h" diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c index bcc7ad1e444..3dc008ea4f3 100644 --- a/hw/core/or-irq.c +++ b/hw/core/or-irq.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/or-irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" =20 diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c index 4b6cc5f6498..a2217a2deec 100644 --- a/hw/core/platform-bus.c +++ b/hw/core/platform-bus.c @@ -21,7 +21,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/platform-bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 7aa5cbb5103..d0a66358b5a 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 422a486969c..b4e936dcf06 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qapi/qapi-types-misc.h" #include "qapi/qapi-visit-common.h" diff --git a/hw/core/qdev.c b/hw/core/qdev.c index fae9ffc7595..a3b41286ea0 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -33,7 +33,7 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "hw/sysbus.h" #include "hw/core/qdev-clock.h" diff --git a/hw/core/split-irq.c b/hw/core/split-irq.c index d0aaa108eb9..7491d74791e 100644 --- a/hw/core/split-irq.c +++ b/hw/core/split-irq.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/core/split-irq.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" =20 diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index 1a6fb914f3b..28cc4b3a4bd 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "hw/cpu/a15mpcore.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/kvm.h" #include "kvm_arm.h" #include "target/arm/gtimer.h" diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c index 9f8e0f70c49..2127f955789 100644 --- a/hw/cpu/a9mpcore.c +++ b/hw/cpu/a9mpcore.c @@ -13,7 +13,7 @@ #include "qemu/module.h" #include "hw/cpu/a9mpcore.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/cpu.h" #include "target/arm/cpu-qom.h" =20 diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c index 1953d12f61b..f3a5174c1f9 100644 --- a/hw/cpu/arm11mpcore.c +++ b/hw/cpu/arm11mpcore.c @@ -13,7 +13,7 @@ #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #define ARM11MPCORE_NUM_GIC_PRIORITY_BITS 4 =20 diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c index ef3b3d1e940..628fe333673 100644 --- a/hw/cpu/cluster.c +++ b/hw/cpu/cluster.c @@ -22,7 +22,7 @@ =20 #include "hw/core/cpu.h" #include "hw/cpu/cluster.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" =20 static const Property cpu_cluster_properties[] =3D { diff --git a/hw/cxl/switch-mailbox-cci.c b/hw/cxl/switch-mailbox-cci.c index 223f2204331..5ba587b4e55 100644 --- a/hw/cxl/switch-mailbox-cci.c +++ b/hw/cxl/switch-mailbox-cci.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/cxl/cxl.h" =20 #define CXL_SWCCI_MSIX_MBOX 3 diff --git a/hw/display/artist.c b/hw/display/artist.c index e6fed03786e..22524d9c5fe 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -17,7 +17,7 @@ #include "hw/sysbus.h" #include "hw/core/loader.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "ui/console.h" #include "trace.h" diff --git a/hw/display/ati.c b/hw/display/ati.c index f7c0006a879..e9c3ad2cd15 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -20,7 +20,7 @@ #include "ati_int.h" #include "ati_regs.h" #include "vga-access.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "vga_regs.h" #include "qemu/bswap.h" #include "qemu/log.h" diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index f8f13b55cb4..8eec0dc600b 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -31,7 +31,7 @@ #include "framebuffer.h" #include "ui/pixel_ops.h" #include "hw/misc/bcm2835_mbox_defs.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index ad2821c9745..5fb6b733cb5 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -9,7 +9,7 @@ #include "qemu/module.h" #include "qemu/units.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/display/bochs-vbe.h" #include "hw/display/edid.h" diff --git a/hw/display/cg3.c b/hw/display/cg3.c index 5ec09b63247..f4067d7825a 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -32,7 +32,7 @@ #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index ef08694626d..37228ff1345 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -40,7 +40,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "ui/pixel_ops.h" #include "vga_regs.h" diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c index 5cacf4fc127..bad9ec7599c 100644 --- a/hw/display/cirrus_vga_isa.c +++ b/hw/display/cirrus_vga_isa.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/isa/isa.h" #include "cirrus_vga_internal.h" #include "qom/object.h" diff --git a/hw/display/dm163.c b/hw/display/dm163.c index e78804693cd..4feae912945 100644 --- a/hw/display/dm163.c +++ b/hw/display/dm163.c @@ -18,7 +18,7 @@ #include "qapi/error.h" #include "migration/vmstate.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/display/dm163.h" #include "ui/console.h" #include "trace.h" diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 8d8062f427c..8e3a61ed0e8 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/hw.h" #include "hw/core/irq.h" #include "hw/sysbus.h" diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 10686cd6763..8ed3e6ecc37 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -21,7 +21,7 @@ #include "qemu/units.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/display/i2c-ddc.c b/hw/display/i2c-ddc.c index 2adfc1a1472..1fddc5807a0 100644 --- a/hw/display/i2c-ddc.c +++ b/hw/display/i2c-ddc.c @@ -20,7 +20,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/i2c/i2c.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/display/i2c-ddc.h" =20 diff --git a/hw/display/macfb.c b/hw/display/macfb.c index 574d667173c..fa3572ead34 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -18,7 +18,7 @@ #include "hw/nubus/nubus.h" #include "hw/display/macfb.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" =20 diff --git a/hw/display/pl110.c b/hw/display/pl110.c index e78a55184e9..2537c264625 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "ui/console.h" #include "framebuffer.h" diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 18f482ca7f7..f29b736722c 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -28,7 +28,7 @@ #include "qemu/atomic.h" #include "qemu/main-loop.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/runstate.h" #include "migration/cpr.h" #include "migration/vmstate.h" diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c index 130f4e01df0..f1958be32ad 100644 --- a/hw/display/ramfb-standalone.c +++ b/hw/display/ramfb-standalone.c @@ -3,7 +3,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/display/ramfb.h" #include "ui/console.h" #include "qom/object.h" diff --git a/hw/display/sm501.c b/hw/display/sm501.c index bc091b3c9fb..6ccec03fe72 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -35,7 +35,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/i2c/i2c.h" #include "hw/display/i2c-ddc.h" #include "qemu/range.h" diff --git a/hw/display/tcx.c b/hw/display/tcx.c index dfe234e3354..b208923523a 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -28,7 +28,7 @@ #include "ui/console.h" #include "ui/pixel_ops.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/error-report.h" diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index d2213b0f3e6..95d85ff69a5 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -31,7 +31,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "ui/console.h" #include "qom/object.h" =20 diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c index 33263856b76..4c497b70f41 100644 --- a/hw/display/vga-mmio.c +++ b/hw/display/vga-mmio.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/display/vga.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "ui/console.h" #include "vga_int.h" =20 diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index 7a39bb9b213..d0f9de1ab35 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -26,7 +26,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "vga_int.h" #include "ui/pixel_ops.h" diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 9fc6bbcd2ce..3f6fb7a8033 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qemu/sockets.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-gpu.h" #include "chardev/char-fe.h" #include "qapi/error.h" diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c index c06a078fb36..b98ef2ef987 100644 --- a/hw/display/virtio-gpu-gl.c +++ b/hw/display/virtio-gpu-gl.c @@ -21,7 +21,7 @@ #include "hw/virtio/virtio-gpu.h" #include "hw/virtio/virtio-gpu-bswap.h" #include "hw/virtio/virtio-gpu-pixman.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #include =20 diff --git a/hw/display/virtio-gpu-pci-gl.c b/hw/display/virtio-gpu-pci-gl.c index a2819e1ca93..c8923795dfa 100644 --- a/hw/display/virtio-gpu-pci-gl.c +++ b/hw/display/virtio-gpu-pci-gl.c @@ -15,7 +15,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-gpu-pci.h" diff --git a/hw/display/virtio-gpu-pci-rutabaga.c b/hw/display/virtio-gpu-p= ci-rutabaga.c index 5fdff37f2c1..4db77cb868d 100644 --- a/hw/display/virtio-gpu-pci-rutabaga.c +++ b/hw/display/virtio-gpu-pci-rutabaga.c @@ -4,7 +4,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-gpu-pci.h" diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c index c0d71b6254c..22659ca196b 100644 --- a/hw/display/virtio-gpu-pci.c +++ b/hw/display/virtio-gpu-pci.c @@ -15,7 +15,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-gpu-pci.h" diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 43e88a4daff..f23eec6862a 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -26,7 +26,7 @@ #include "hw/virtio/virtio-gpu-bswap.h" #include "hw/virtio/virtio-gpu-pixman.h" #include "hw/virtio/virtio-bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/memfd.h" #include "qemu/module.h" diff --git a/hw/display/virtio-vga-gl.c b/hw/display/virtio-vga-gl.c index 984faa6b39a..178e4c71725 100644 --- a/hw/display/virtio-vga-gl.c +++ b/hw/display/virtio-vga-gl.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-gpu.h" #include "hw/display/vga.h" #include "qapi/error.h" diff --git a/hw/display/virtio-vga-rutabaga.c b/hw/display/virtio-vga-rutab= aga.c index a7bef6da248..1e07ee0b0d3 100644 --- a/hw/display/virtio-vga-rutabaga.c +++ b/hw/display/virtio-vga-rutabaga.c @@ -2,7 +2,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-gpu.h" #include "hw/display/vga.h" #include "qapi/error.h" diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 40e60f70fcd..5e087169f2f 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-gpu.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 7ca5a551426..ea7a9fca04e 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -30,7 +30,7 @@ #include "hw/core/loader.h" #include "trace.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qom/object.h" #include "ui/console.h" diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index e226eda6d15..c909cf46401 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/dma/i8257.h" #include "qom/object.h" diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index 2463952ada2..d909d6c8fc2 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/dma/i8257.h" #include "qapi/error.h" diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index 28f79371646..bd61d8ed488 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -15,7 +15,7 @@ #include "hw/dma/pl080.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" =20 #define PL080_CONF_E 0x1 diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index a9e6d2746f0..4f00092f856 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/dma/sifive_pdma.c b/hw/dma/sifive_pdma.c index bae77544b23..2fbc37ffd14 100644 --- a/hw/dma/sifive_pdma.c +++ b/hw/dma/sifive_pdma.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "system/dma.h" diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 9f56faf9a53..5601d221ec2 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -27,7 +27,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sparc/sparc32_dma.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 15da3fcbc2c..7cdd76330f3 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -29,7 +29,7 @@ #include "hw/hw.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" =20 diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c index 660fc21b6d1..306c56c3ef5 100644 --- a/hw/dma/xlnx-zdma.c +++ b/hw/dma/xlnx-zdma.c @@ -29,7 +29,7 @@ #include "qemu/osdep.h" #include "hw/dma/xlnx-zdma.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c index 92f445034e8..650401614ed 100644 --- a/hw/dma/xlnx_csu_dma.c +++ b/hw/dma/xlnx_csu_dma.c @@ -22,7 +22,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "system/dma.h" diff --git a/hw/fsi/cfam.c b/hw/fsi/cfam.c index e2145c5934b..54c0b05769d 100644 --- a/hw/fsi/cfam.c +++ b/hw/fsi/cfam.c @@ -14,7 +14,7 @@ #include "hw/fsi/cfam.h" #include "hw/fsi/fsi.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #define ENGINE_CONFIG_NEXT BIT(31) #define ENGINE_CONFIG_TYPE_PEEK (0x02 << 4) diff --git a/hw/fsi/lbus.c b/hw/fsi/lbus.c index 8ec7f5fd780..cae29e0658b 100644 --- a/hw/fsi/lbus.c +++ b/hw/fsi/lbus.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/fsi/lbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "trace.h" =20 diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c index 842c997a2a6..5abf208df47 100644 --- a/hw/gpio/imx_gpio.c +++ b/hw/gpio/imx_gpio.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/gpio/imx_gpio.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/gpio/npcm7xx_gpio.c b/hw/gpio/npcm7xx_gpio.c index 59b95d232bf..ad19b9fd427 100644 --- a/hw/gpio/npcm7xx_gpio.c +++ b/hw/gpio/npcm7xx_gpio.c @@ -17,7 +17,7 @@ =20 #include "hw/gpio/npcm7xx_gpio.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 547f0a15a27..0c2a0f9aa6c 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/gpio/pca9552.c b/hw/gpio/pca9552.c index fe1d8dbffa2..dd3c795e49a 100644 --- a/hw/gpio/pca9552.c +++ b/hw/gpio/pca9552.c @@ -14,7 +14,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qemu/bitops.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/gpio/pca9552.h" #include "hw/gpio/pca9552_regs.h" #include "hw/core/irq.h" diff --git a/hw/gpio/pca9554.c b/hw/gpio/pca9554.c index c6cdd27b3ff..8427e01e9b2 100644 --- a/hw/gpio/pca9554.c +++ b/hw/gpio/pca9554.c @@ -10,7 +10,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qemu/bitops.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/gpio/pca9554.h" #include "hw/gpio/pca9554_regs.h" #include "hw/core/irq.h" diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c index 09b32247127..55f51b6cf20 100644 --- a/hw/gpio/pl061.c +++ b/hw/gpio/pl061.c @@ -32,7 +32,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/gpio/sifive_gpio.c b/hw/gpio/sifive_gpio.c index 63ca721fadd..b7a56935c05 100644 --- a/hw/gpio/sifive_gpio.c +++ b/hw/gpio/sifive_gpio.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/gpio/sifive_gpio.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/gpio/stm32l4x5_gpio.c b/hw/gpio/stm32l4x5_gpio.c index 5686bd53c23..92fa397fbaf 100644 --- a/hw/gpio/stm32l4x5_gpio.c +++ b/hw/gpio/stm32l4x5_gpio.c @@ -22,7 +22,7 @@ #include "hw/core/irq.h" #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/visitor.h" #include "qapi/error.h" #include "migration/vmstate.h" diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c index deb20d7b6a3..9dd759f11e8 100644 --- a/hw/hyperv/hv-balloon.c +++ b/hw/hyperv/hv-balloon.c @@ -20,7 +20,7 @@ #include "hw/mem/memory-device.h" #include "hw/mem/pc-dimm.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "monitor/qdev.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" diff --git a/hw/hyperv/syndbg.c b/hw/hyperv/syndbg.c index 29908e886b4..dc6cc84b503 100644 --- a/hw/hyperv/syndbg.c +++ b/hw/hyperv/syndbg.c @@ -13,7 +13,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/loader.h" #include "exec/target_page.h" #include "hw/hyperv/hyperv.h" diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 961406cdd6a..639d932b094 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -13,7 +13,7 @@ #include "exec/target_page.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/hyperv/hyperv.h" #include "hw/hyperv/vmbus.h" diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c index 3d66dd863a1..e3ca77865bd 100644 --- a/hw/i2c/aspeed_i2c.c +++ b/hw/i2c/aspeed_i2c.c @@ -28,7 +28,7 @@ #include "qapi/error.h" #include "hw/i2c/aspeed_i2c.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "trace.h" =20 diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 4b6345b5889..54f6bdca882 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "hw/i2c/i2c.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/i2c/i2c_mux_pca954x.c b/hw/i2c/i2c_mux_pca954x.c index fd317f56701..7802c68452f 100644 --- a/hw/i2c/i2c_mux_pca954x.c +++ b/hw/i2c/i2c_mux_pca954x.c @@ -20,7 +20,7 @@ #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_slave.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index 6ac151d8515..c768f99e384 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -22,7 +22,7 @@ #include "qemu/module.h" #include "hw/i2c/i2c.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index ce3723e1483..d9ac556a0ab 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -28,7 +28,7 @@ #include "hw/core/boards.h" #include "hw/i2c/i2c.h" #include "hw/i2c/smbus_slave.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/i2c/smbus_eeprom.h" #include "qom/object.h" diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index d689a06eca4..789e09d6f2b 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -31,7 +31,7 @@ #include "hw/i386/apic_internal.h" #include "trace.h" #include "hw/i386/apic-msidef.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "kvm/kvm_i386.h" #include "qemu/iova-tree.h" =20 diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 78b142cceab..f744be9f70f 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -27,7 +27,7 @@ #include "intel_iommu_internal.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/i386/pc.h" #include "hw/i386/apic-msidef.h" #include "hw/i386/x86-iommu.h" diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index f56382717f7..310b9a8eb5a 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -23,7 +23,7 @@ #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/i386/kvm/clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" =20 #include diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index 693ee978a12..ba7888e3d1e 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "monitor/monitor.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/ioapic_internal.h" #include "hw/intc/kvm_irqcount.h" #include "system/kvm.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 5fd2f9d1e0c..18158ad15e4 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -40,7 +40,7 @@ #include "hw/i386/kvm/clock.h" #include "hw/pci-host/q35.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" #include "hw/i386/amd_iommu.h" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 4d64aa15550..906df5e7886 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -33,7 +33,7 @@ #include "hw/i386/x86.h" #include "hw/i386/pc.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/block/flash.h" #include "system/kvm.h" #include "target/i386/sev.h" diff --git a/hw/i386/sgx-epc.c b/hw/i386/sgx-epc.c index 2b3b2823b5f..d3fe10028c5 100644 --- a/hw/i386/sgx-epc.c +++ b/hw/i386/sgx-epc.c @@ -13,7 +13,7 @@ #include "hw/i386/pc.h" #include "hw/i386/sgx-epc.h" #include "hw/mem/memory-device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "target/i386/cpu.h" diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c index 3896159b055..2ae7f3a242e 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.c @@ -27,7 +27,7 @@ #include "ui/console.h" #include "hw/i386/vmport.h" #include "hw/input/i8042.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "cpu.h" #include "qom/object.h" diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c index 32e02e1eeb0..865e0e70db6 100644 --- a/hw/i386/vmport.c +++ b/hw/i386/vmport.c @@ -31,7 +31,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" #include "hw/i386/vmport.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "system/system.h" #include "system/hw_accel.h" diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index c127a44bb4b..21e0d40e114 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/i386/x86-iommu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/i386/pc.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c index 87a974ae5a0..fab26a06af1 100644 --- a/hw/i386/xen/xen_pvdevice.c +++ b/hw/i386/xen/xen_pvdevice.c @@ -33,7 +33,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" #include "qom/object.h" diff --git a/hw/ide/ahci-sysbus.c b/hw/ide/ahci-sysbus.c index 210818d0479..c722e91be1c 100644 --- a/hw/ide/ahci-sysbus.c +++ b/hw/ide/ahci-sysbus.c @@ -23,7 +23,7 @@ =20 #include "qemu/osdep.h" #include "system/address-spaces.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 #include "hw/ide/ahci-sysbus.h" diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 2a59516a9dd..d44a90a1622 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/isa/isa.h" diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 5f418413c18..c97b7a1ff4d 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 07db7dc34aa..a7ed41fa265 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/ppc/mac_dbdma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/misc/macio/macio.h" diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index 699874db785..04b56ac5d86 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -30,7 +30,7 @@ #include "system/dma.h" =20 #include "hw/ide/mmio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "ide-internal.h" =20 /***********************************************************/ diff --git a/hw/input/adb.c b/hw/input/adb.c index bcb11edca35..29c09c75596 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/input/adb.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index 70a179907ca..e34e9cb5c02 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/input/ps2.h" #include "hw/input/lasips2.h" diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 48b457cac76..b09c3bce933 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -33,7 +33,7 @@ #include "hw/input/ps2.h" #include "hw/core/irq.h" #include "hw/input/i8042.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/reset.h" #include "system/runstate.h" =20 diff --git a/hw/input/stellaris_gamepad.c b/hw/input/stellaris_gamepad.c index bd80db6fac5..f64f5ea9ce3 100644 --- a/hw/input/stellaris_gamepad.c +++ b/hw/input/stellaris_gamepad.c @@ -11,7 +11,7 @@ #include "qapi/error.h" #include "hw/input/stellaris_gamepad.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "ui/console.h" =20 diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index d986c3c16e3..bcbfef0b905 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -9,7 +9,7 @@ #include "qemu/module.h" =20 #include "hw/virtio/virtio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-input.h" =20 #include "ui/console.h" diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c index 9f62532559d..633547cc4f7 100644 --- a/hw/input/virtio-input-host.c +++ b/hw/input/virtio-input-host.c @@ -10,7 +10,7 @@ #include "qemu/sockets.h" =20 #include "hw/virtio/virtio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-input.h" =20 #include diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c index a3f554f2110..6494cfbbe82 100644 --- a/hw/input/virtio-input.c +++ b/hw/input/virtio-input.c @@ -11,7 +11,7 @@ #include "trace.h" =20 #include "hw/virtio/virtio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-input.h" =20 #include "standard-headers/linux/input.h" diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 83e1bc2d759..afac20440f8 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -29,7 +29,7 @@ #include "trace.h" #include "hw/core/boards.h" #include "system/kvm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" =20 diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c index ed5be056452..304d89cf562 100644 --- a/hw/intc/arm_gic_common.c +++ b/hw/intc/arm_gic_common.c @@ -24,7 +24,7 @@ #include "qemu/error-report.h" #include "gic_internal.h" #include "hw/arm/linux-boot-if.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/kvm.h" =20 diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c index e823fcc97fc..c39d31b1870 100644 --- a/hw/intc/arm_gicv2m.c +++ b/hw/intc/arm_gicv2m.c @@ -30,7 +30,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/pci/msi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/kvm.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 2d0df6da86c..0a2e5a3e2fc 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -27,7 +27,7 @@ #include "qemu/error-report.h" #include "hw/core/cpu.h" #include "hw/intc/arm_gicv3_common.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "gicv3_internal.h" #include "hw/arm/linux-boot-if.h" diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index 577b4454057..cce3486d74c 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/arm_gicv3_its_common.h" #include "gicv3_internal.h" #include "qom/object.h" diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c index 9812d508597..ae12d41eee1 100644 --- a/hw/intc/arm_gicv3_its_kvm.c +++ b/hw/intc/arm_gicv3_its_kvm.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "hw/intc/arm_gicv3_its_common.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/runstate.h" #include "system/kvm.h" #include "kvm_arm.h" diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index bb39a690a59..5fa210c6335 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -17,7 +17,7 @@ #include "qemu/timer.h" #include "hw/intc/armv7m_nvic.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/tcg.h" #include "system/runstate.h" #include "target/arm/cpu.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index b9e74d19c37..8bea69d91b7 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -35,7 +35,7 @@ #include "hw/arm/exynos4210.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" =20 //#define DEBUG_COMBINER diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index 5b156f7ef5a..a65c9c6d28b 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/exynos4210_gic.h" #include "hw/arm/exynos4210.h" #include "qom/object.h" diff --git a/hw/intc/goldfish_pic.c b/hw/intc/goldfish_pic.c index 7aaccba75ae..96e7d5c225f 100644 --- a/hw/intc/goldfish_pic.c +++ b/hw/intc/goldfish_pic.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c index bb2ee5f8015..ce7cbc98c17 100644 --- a/hw/intc/grlib_irqmp.c +++ b/hw/intc/grlib_irqmp.c @@ -30,7 +30,7 @@ #include "hw/core/irq.h" #include "hw/sysbus.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/grlib_irqmp.h" =20 #include "trace.h" diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c index 602e44c8eaf..8ceb5841b9b 100644 --- a/hw/intc/i8259_common.c +++ b/hw/intc/i8259_common.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/intc/i8259.h" #include "hw/isa/i8259_internal.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" =20 diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index 38e43846486..98de6ca8108 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -29,7 +29,7 @@ #include "hw/intc/ioapic.h" #include "hw/intc/ioapic_internal.h" #include "hw/pci/msi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/accel-irq.h" #include "system/kvm.h" #include "system/system.h" diff --git a/hw/intc/loongarch_dintc.c b/hw/intc/loongarch_dintc.c index 082755d28bb..574e4a0d277 100644 --- a/hw/intc/loongarch_dintc.c +++ b/hw/intc/loongarch_dintc.c @@ -15,7 +15,7 @@ #include "hw/misc/unimp.h" #include "migration/vmstate.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "target/loongarch/cpu.h" #include "qemu/error-report.h" #include "system/hw_accel.h" diff --git a/hw/intc/loongarch_extioi_common.c b/hw/intc/loongarch_extioi_c= ommon.c index ba03383ed19..5cb0d396c65 100644 --- a/hw/intc/loongarch_extioi_common.c +++ b/hw/intc/loongarch_extioi_common.c @@ -7,7 +7,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/loongarch_extioi_common.h" #include "migration/vmstate.h" #include "target/loongarch/cpu.h" diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c index 2a4557a8baa..5d8b8c96df7 100644 --- a/hw/intc/loongarch_ipi.c +++ b/hw/intc/loongarch_ipi.c @@ -10,7 +10,7 @@ #include "hw/core/boards.h" #include "qapi/error.h" #include "hw/intc/loongarch_ipi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/kvm.h" #include "target/loongarch/cpu.h" =20 diff --git a/hw/intc/loongarch_pic_common.c b/hw/intc/loongarch_pic_common.c index de170501cf2..309182b2fb1 100644 --- a/hw/intc/loongarch_pic_common.c +++ b/hw/intc/loongarch_pic_common.c @@ -7,7 +7,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/intc/loongarch_pic_common.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 static int loongarch_pic_pre_save(void *opaque) diff --git a/hw/intc/loongson_ipi.c b/hw/intc/loongson_ipi.c index fbc73e8b001..88d22afa6ac 100644 --- a/hw/intc/loongson_ipi.c +++ b/hw/intc/loongson_ipi.c @@ -7,7 +7,7 @@ =20 #include "qemu/osdep.h" #include "hw/intc/loongson_ipi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "target/mips/cpu.h" =20 diff --git a/hw/intc/loongson_liointc.c b/hw/intc/loongson_liointc.c index 4c24f330ed7..053d9898f8c 100644 --- a/hw/intc/loongson_liointc.c +++ b/hw/intc/loongson_liointc.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/loongson_liointc.h" =20 #define NUM_IRQS 32 diff --git a/hw/intc/m68k_irqc.c b/hw/intc/m68k_irqc.c index 67cb9acb418..c652bf143f0 100644 --- a/hw/intc/m68k_irqc.c +++ b/hw/intc/m68k_irqc.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/nmi.h" #include "hw/intc/intc.h" #include "hw/intc/m68k_irqc.h" diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index 08925fe1e41..e983f3a2b58 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -20,7 +20,7 @@ #include "kvm_mips.h" #include "hw/intc/mips_gic.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 static void mips_gic_set_vp_irq(MIPSGICState *gic, int vp, int pin) { diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index 7b23b6d2cec..deb21f9dc19 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c index 5a630bd51cb..05f0ef82549 100644 --- a/hw/intc/ompic.c +++ b/hw/intc/ompic.c @@ -10,7 +10,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "system/memory.h" diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index edac46227f5..4cc5068ffc8 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -35,7 +35,7 @@ #include "hw/pci/pci.h" #include "hw/ppc/openpic.h" #include "hw/ppc/ppc_e500.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/msi.h" diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 673ea9ca055..6558135baa1 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -28,7 +28,7 @@ #include "hw/ppc/openpic.h" #include "hw/ppc/openpic_kvm.h" #include "hw/pci/msi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "system/kvm.h" #include "qemu/log.h" diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c index c2ca40b8be8..13ac2c6ccbf 100644 --- a/hw/intc/pnv_xive.c +++ b/hw/intc/pnv_xive.c @@ -21,7 +21,7 @@ #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_xive.h" #include "hw/ppc/xive_regs.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/ppc.h" #include "trace.h" =20 diff --git a/hw/intc/pnv_xive2.c b/hw/intc/pnv_xive2.c index 0663baab544..ae424d01c42 100644 --- a/hw/intc/pnv_xive2.c +++ b/hw/intc/pnv_xive2.c @@ -22,7 +22,7 @@ #include "hw/ppc/xive_regs.h" #include "hw/ppc/xive2_regs.h" #include "hw/ppc/ppc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/reset.h" #include "system/qtest.h" =20 diff --git a/hw/intc/ppc-uic.c b/hw/intc/ppc-uic.c index bfc4a4fbceb..5090101f077 100644 --- a/hw/intc/ppc-uic.c +++ b/hw/intc/ppc-uic.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/intc/ppc-uic.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 enum { diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c index ecaf8201fd6..56ece334a5e 100644 --- a/hw/intc/realview_gic.c +++ b/hw/intc/realview_gic.c @@ -12,7 +12,7 @@ #include "qemu/module.h" #include "hw/intc/realview_gic.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 static void realview_gic_set_irq(void *opaque, int irq, int level) { diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c index f3e37df47d1..83968ad7cca 100644 --- a/hw/intc/riscv_aclint.c +++ b/hw/intc/riscv_aclint.c @@ -29,7 +29,7 @@ #include "hw/sysbus.h" #include "target/riscv/cpu.h" #include "target/riscv/time_helper.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/riscv_aclint.h" #include "qemu/timer.h" #include "hw/core/irq.h" diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c index 580622d1712..cc5f30b5588 100644 --- a/hw/intc/riscv_aplic.c +++ b/hw/intc/riscv_aplic.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "hw/pci/msi.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/riscv_aplic.h" #include "hw/core/irq.h" #include "target/riscv/cpu.h" diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c index 54e72b81e78..bc580c000ef 100644 --- a/hw/intc/riscv_imsic.c +++ b/hw/intc/riscv_imsic.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "hw/pci/msi.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/riscv_imsic.h" #include "hw/core/irq.h" #include "target/riscv/cpu.h" diff --git a/hw/intc/rx_icu.c b/hw/intc/rx_icu.c index 84712e2e4d0..788afe6b1a0 100644 --- a/hw/intc/rx_icu.c +++ b/hw/intc/rx_icu.c @@ -28,7 +28,7 @@ #include "qemu/error-report.h" #include "hw/core/irq.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/rx_icu.h" #include "migration/vmstate.h" =20 diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index 1eed5125d17..508b58382ed 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -17,7 +17,7 @@ #include "hw/sysbus.h" #include "hw/s390x/ioinst.h" #include "hw/s390x/s390_flic.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/css.h" #include "trace.h" #include "qapi/error.h" diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c index c578b6e36d2..5df578822f9 100644 --- a/hw/intc/sifive_plic.c +++ b/hw/intc/sifive_plic.c @@ -25,7 +25,7 @@ #include "qemu/error-report.h" #include "hw/sysbus.h" #include "hw/pci/msi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/sifive_plic.h" #include "target/riscv/cpu.h" #include "migration/vmstate.h" diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index e393f5dcdcc..76ab476f59a 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -21,7 +21,7 @@ #include "hw/ppc/spapr_xive.h" #include "hw/ppc/xive.h" #include "hw/ppc/xive_regs.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" =20 /* diff --git a/hw/intc/xics.c b/hw/intc/xics.c index e87c0ad2bcd..1d40c4386d1 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -30,7 +30,7 @@ #include "trace.h" #include "qemu/timer.h" #include "hw/ppc/xics.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/visitor.h" diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index f5a59d89830..465df1c3af2 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -30,7 +30,7 @@ #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qom/object.h" =20 diff --git a/hw/intc/xive.c b/hw/intc/xive.c index 6f9babf601c..d702b58bd0a 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -14,7 +14,7 @@ #include "system/cpus.h" #include "system/dma.h" #include "system/reset.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/ppc/xive.h" diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c index fbb3b7975e5..495925196a8 100644 --- a/hw/intc/xive2.c +++ b/hw/intc/xive2.c @@ -13,7 +13,7 @@ #include "target/ppc/cpu.h" #include "system/cpus.h" #include "system/dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/xive.h" #include "hw/ppc/xive2.h" #include "hw/ppc/xive2_regs.h" diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c index 098c1f327cd..f3509efa0ab 100644 --- a/hw/intc/xlnx-pmu-iomod-intc.c +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -33,7 +33,7 @@ #include "qemu/module.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #ifndef XLNX_PMU_IO_INTC_ERR_DEBUG #define XLNX_PMU_IO_INTC_ERR_DEBUG 0 diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c index 4a710eb1876..f2e5524fa8b 100644 --- a/hw/ipack/ipack.c +++ b/hw/ipack/ipack.c @@ -13,7 +13,7 @@ #include "qemu/module.h" #include "hw/ipack/ipack.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot) diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c index 2a7bc667ec3..b49affaccec 100644 --- a/hw/ipmi/ipmi.c +++ b/hw/ipmi/ipmi.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/ipmi/ipmi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object_interfaces.h" #include "system/runstate.h" #include "qapi/error.h" diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index 2c6c5155792..fb90a7d7c30 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -34,7 +34,7 @@ #include "qemu/timer.h" #include "chardev/char-fe.h" #include "hw/ipmi/ipmi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 9b3e3a4b7e7..b86943c3245 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -29,7 +29,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" =20 diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index 2b26f9c9f0f..911e16afbe7 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -28,7 +28,7 @@ #include "hw/core/irq.h" #include "hw/ipmi/ipmi_bt.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qom/object.h" #include "hw/acpi/ipmi.h" diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index 14e85e6e9fd..927f6b7a561 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -28,7 +28,7 @@ #include "hw/core/irq.h" #include "hw/ipmi/ipmi_kcs.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qom/object.h" #include "hw/acpi/ipmi.h" diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index 941b0f91d75..dc6ae3cb104 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -20,7 +20,7 @@ #include "hw/char/parallel.h" #include "hw/block/fdc.h" #include "hw/isa/superio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/input/i8042.h" #include "hw/char/parallel-isa.h" #include "hw/char/serial-isa.h" diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 6e772eca573..51dc680029d 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -45,7 +45,7 @@ #include "hw/acpi/ich9.h" #include "hw/acpi/ich9_timer.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/runstate.h" #include "system/system.h" #include "hw/core/cpu.h" diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 388da8f5900..2a2c3e7b66a 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "hw/isa/pc87312.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/isa/piix.c b/hw/isa/piix.c index bf1c79a3e63..04b2be2cc39 100644 --- a/hw/isa/piix.c +++ b/hw/isa/piix.c @@ -30,7 +30,7 @@ #include "hw/southbridge/piix.h" #include "hw/timer/i8254.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ide/piix.h" #include "hw/intc/i8259.h" #include "hw/isa/isa.h" diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 1362a1f4042..99be41d0adf 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -19,7 +19,7 @@ #include "hw/char/parallel-isa.h" #include "hw/char/serial-isa.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ide/pci.h" #include "hw/isa/isa.h" #include "hw/isa/superio.h" diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index e17da4fd209..4bc7b1d189e 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -10,7 +10,7 @@ #include "qemu/error-report.h" #include "qemu/log.h" #include "cpu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "hw/core/irq.h" #include "hw/m68k/mcf.h" diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c index efac6802a97..b8770e3a53f 100644 --- a/hw/m68k/mcf_intc.c +++ b/hw/m68k/mcf_intc.c @@ -14,7 +14,7 @@ #include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/m68k/mcf.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" =20 #define TYPE_MCF_INTC "mcf-intc" diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index e7217cbaeac..75ae66c311a 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -25,7 +25,7 @@ #include "hw/char/escc.h" /* ZILOG 8530 Serial Emulation */ #include "hw/block/fdc.h" #include "hw/misc/empty_slot.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "ui/console.h" diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c index 84dd01459cd..24fccab9666 100644 --- a/hw/m68k/q800-glue.c +++ b/hw/m68k/q800-glue.c @@ -26,7 +26,7 @@ #include "hw/core/boards.h" #include "hw/core/irq.h" #include "hw/core/nmi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 /* diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 7007d4e4e9f..2d83919fa86 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -14,7 +14,7 @@ #include "system/system.h" #include "cpu.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "elf.h" #include "hw/core/loader.h" #include "ui/console.h" diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index 4f3688a71b6..26baa1c3d6c 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -17,7 +17,7 @@ #include "hw/mem/memory-device.h" #include "hw/mem/pc-dimm.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index 23ab143ef8e..b7032525271 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -28,7 +28,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/mem/nvdimm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/mem/memory-device.h" #include "system/hostmem.h" =20 diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 33e5a376ffa..3efe47f499a 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "hw/core/boards.h" #include "hw/mem/pc-dimm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/mem/nvdimm.h" #include "hw/mem/memory-device.h" diff --git a/hw/mem/sparse-mem.c b/hw/mem/sparse-mem.c index d7b00e563ae..9186da6b1a9 100644 --- a/hw/mem/sparse-mem.c +++ b/hw/mem/sparse-mem.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/units.h" diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_= ml605_mmu.c index f5b9b2e8904..9c2b0ff0b37 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -35,7 +35,7 @@ #include "system/system.h" #include "hw/core/boards.h" #include "hw/char/serial-mm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/address-spaces.h" #include "hw/ssi/ssi.h" =20 diff --git a/hw/mips/boston.c b/hw/mips/boston.c index b63b27d03fa..4579df23eb7 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -31,7 +31,7 @@ #include "hw/mips/cps.h" #include "hw/pci-host/xilinx-pcie.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/guest-random.h" diff --git a/hw/mips/cps.c b/hw/mips/cps.c index 13f048ef9c9..620ee972f8f 100644 --- a/hw/mips/cps.c +++ b/hw/mips/cps.c @@ -23,7 +23,7 @@ #include "hw/mips/cps.h" #include "hw/mips/mips.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/tcg.h" #include "system/reset.h" =20 diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index d4c100b69a0..d0efe36f7ce 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -33,7 +33,7 @@ #include "hw/pci/pci.h" #include "hw/core/loader.h" #include "hw/ide/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "elf.h" #include "hw/isa/vt82c686.h" #include "system/qtest.h" diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c index bb00ae29692..d5eb985044b 100644 --- a/hw/misc/a9scu.c +++ b/hw/misc/a9scu.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "hw/misc/a9scu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/misc/allwinner-h3-dramc.c b/hw/misc/allwinner-h3-dramc.c index 8834524c30c..ef491b36ffb 100644 --- a/hw/misc/allwinner-h3-dramc.c +++ b/hw/misc/allwinner-h3-dramc.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "system/address-spaces.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "hw/misc/allwinner-h3-dramc.h" #include "trace.h" diff --git a/hw/misc/allwinner-r40-dramc.c b/hw/misc/allwinner-r40-dramc.c index 1c8e17e3c0b..3af8af733ac 100644 --- a/hw/misc/allwinner-r40-dramc.c +++ b/hw/misc/allwinner-r40-dramc.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "system/address-spaces.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/bitops.h" #include "hw/misc/allwinner-r40-dramc.h" diff --git a/hw/misc/allwinner-sid.c b/hw/misc/allwinner-sid.c index 1e66c14567b..17faf67e606 100644 --- a/hw/misc/allwinner-sid.c +++ b/hw/misc/allwinner-sid.c @@ -25,7 +25,7 @@ #include "qemu/module.h" #include "qemu/guest-random.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/misc/allwinner-sid.h" #include "trace.h" diff --git a/hw/misc/allwinner-sramc.c b/hw/misc/allwinner-sramc.c index ed299ecaae7..bd7f59fec97 100644 --- a/hw/misc/allwinner-sramc.c +++ b/hw/misc/allwinner-sramc.c @@ -24,7 +24,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/misc/allwinner-sramc.h" #include "trace.h" diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index a015d4a9b8c..fd96f5f245f 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -32,7 +32,7 @@ =20 #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "ui/console.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/misc/arm11scu.c b/hw/misc/arm11scu.c index 2ad4fd1d21d..89c2c4cd730 100644 --- a/hw/misc/arm11scu.c +++ b/hw/misc/arm11scu.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "hw/misc/arm11scu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" =20 diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c index 8b4b61eed00..a5511845c7c 100644 --- a/hw/misc/arm_l2x0.c +++ b/hw/misc/arm_l2x0.c @@ -19,7 +19,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index 8995eaeec36..0c91ebafac7 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/timer.h" #include "system/runstate.h" #include "qemu/bitops.h" diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c index a57764d731f..3a52bb5381f 100644 --- a/hw/misc/armsse-cpuid.c +++ b/hw/misc/armsse-cpuid.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "hw/registerfields.h" #include "hw/misc/armsse-cpuid.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 REG32(CPUID, 0x0) REG32(PID4, 0xfd0) diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c index 51c73ca2a52..23e8030cd96 100644 --- a/hw/misc/aspeed_hace.c +++ b/hw/misc/aspeed_hace.c @@ -18,7 +18,7 @@ #include "qapi/error.h" #include "migration/vmstate.h" #include "crypto/hash.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/irq.h" #include "trace.h" =20 diff --git a/hw/misc/aspeed_i3c.c b/hw/misc/aspeed_i3c.c index 3bef1c84dd1..37a05b9ce27 100644 --- a/hw/misc/aspeed_i3c.c +++ b/hw/misc/aspeed_i3c.c @@ -12,7 +12,7 @@ #include "qemu/error-report.h" #include "hw/misc/aspeed_i3c.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/misc/aspeed_lpc.c b/hw/misc/aspeed_lpc.c index 829955e6f16..68f0f6334bc 100644 --- a/hw/misc/aspeed_lpc.c +++ b/hw/misc/aspeed_lpc.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 #define TO_REG(offset) ((offset) >> 2) diff --git a/hw/misc/aspeed_sbc.c b/hw/misc/aspeed_sbc.c index 2fc5db749d2..065e822e70d 100644 --- a/hw/misc/aspeed_sbc.c +++ b/hw/misc/aspeed_sbc.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/aspeed_sbc.h" #include "qapi/error.h" #include "migration/vmstate.h" diff --git a/hw/misc/aspeed_scu.c b/hw/misc/aspeed_scu.c index a0ab5eed8f1..d27e0c7f915 100644 --- a/hw/misc/aspeed_scu.c +++ b/hw/misc/aspeed_scu.c @@ -11,7 +11,7 @@ =20 #include "qemu/osdep.h" #include "hw/misc/aspeed_scu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c index dff7cc362d3..59b4a9a4264 100644 --- a/hw/misc/aspeed_sdmc.c +++ b/hw/misc/aspeed_sdmc.c @@ -12,7 +12,7 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "hw/misc/aspeed_sdmc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/misc/aspeed_sli.c b/hw/misc/aspeed_sli.c index c51484035e0..5b4d70cdc06 100644 --- a/hw/misc/aspeed_sli.c +++ b/hw/misc/aspeed_sli.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/aspeed_sli.h" #include "qapi/error.h" #include "migration/vmstate.h" diff --git a/hw/misc/avr_power.c b/hw/misc/avr_power.c index 947304ed3b6..f42cf4fd906 100644 --- a/hw/misc/avr_power.c +++ b/hw/misc/avr_power.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/misc/avr_power.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/irq.h" #include "trace.h" =20 diff --git a/hw/misc/bcm2835_cprman.c b/hw/misc/bcm2835_cprman.c index efe6f900dbf..8220f7a6b4b 100644 --- a/hw/misc/bcm2835_cprman.c +++ b/hw/misc/bcm2835_cprman.c @@ -46,7 +46,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/bcm2835_cprman.h" #include "hw/misc/bcm2835_cprman_internals.h" #include "trace.h" diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c index 2026294ce12..216a746c2bd 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/misc/bcm2835_property.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/misc/bcm2835_mbox_defs.h" diff --git a/hw/misc/debugexit.c b/hw/misc/debugexit.c index 04a9fc31223..cdd19166a5a 100644 --- a/hw/misc/debugexit.c +++ b/hw/misc/debugexit.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "qom/object.h" #include "system/runstate.h" diff --git a/hw/misc/djmemc.c b/hw/misc/djmemc.c index c5b09f551b0..5fd3a8bfb25 100644 --- a/hw/misc/djmemc.c +++ b/hw/misc/djmemc.c @@ -11,7 +11,7 @@ #include "qemu/log.h" #include "migration/vmstate.h" #include "hw/misc/djmemc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" =20 =20 diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c index 71243ba5bad..f93cbd16590 100644 --- a/hw/misc/eccmemctl.c +++ b/hw/misc/eccmemctl.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/misc/empty_slot.c b/hw/misc/empty_slot.c index 239d7603207..a012668214f 100644 --- a/hw/misc/empty_slot.c +++ b/hw/misc/empty_slot.c @@ -11,7 +11,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/empty_slot.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c index f8a2946191d..64e94a76479 100644 --- a/hw/misc/iotkit-secctl.c +++ b/hw/misc/iotkit-secctl.c @@ -20,7 +20,7 @@ #include "hw/core/irq.h" #include "hw/misc/iotkit-secctl.h" #include "hw/arm/armsse-version.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 /* Registers in the secure privilege control block */ REG32(SECRESPCFG, 0x10) diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c index d70e51ab2ec..a9c3568c216 100644 --- a/hw/misc/iotkit-sysctl.c +++ b/hw/misc/iotkit-sysctl.c @@ -27,7 +27,7 @@ #include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/misc/iotkit-sysctl.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/armsse-version.h" #include "target/arm/arm-powerctl.h" =20 diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c index 57405cb7e17..a53b1f51802 100644 --- a/hw/misc/iotkit-sysinfo.c +++ b/hw/misc/iotkit-sysinfo.c @@ -25,7 +25,7 @@ #include "hw/sysbus.h" #include "hw/registerfields.h" #include "hw/misc/iotkit-sysinfo.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/armsse-version.h" =20 REG32(SYS_VERSION, 0x0) diff --git a/hw/misc/ivshmem-pci.c b/hw/misc/ivshmem-pci.c index 636d0b83dee..fb69af52f62 100644 --- a/hw/misc/ivshmem-pci.c +++ b/hw/misc/ivshmem-pci.c @@ -22,7 +22,7 @@ #include "qapi/error.h" #include "qemu/cutils.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" diff --git a/hw/misc/led.c b/hw/misc/led.c index f7f709072af..d9256aaaf56 100644 --- a/hw/misc/led.c +++ b/hw/misc/led.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/led.h" #include "trace.h" =20 diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index 13ccd3023fb..887397ae842 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -27,7 +27,7 @@ #include "system/runstate.h" #include "qapi/error.h" #include "qemu/cutils.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "system/block-backend.h" #include "system/rtc.h" diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 3b8dd462f56..312dde242ba 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/misc/macio/cuda.h" #include "qemu/timer.h" diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c index 77658cb6d02..1a7c534d652 100644 --- a/hw/misc/macio/gpio.c +++ b/hw/misc/macio/gpio.c @@ -24,7 +24,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/misc/macio/macio.h" #include "hw/misc/macio/gpio.h" diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index 6710485d728..2813705c03b 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -29,7 +29,7 @@ #include "hw/misc/macio/cuda.h" #include "hw/pci/pci.h" #include "hw/ppc/mac_dbdma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/char/escc.h" #include "hw/misc/macio/macio.h" diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index 73e64306b86..04640c20e0a 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -29,7 +29,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/misc/macio/pmu.h" diff --git a/hw/misc/max78000_gcr.c b/hw/misc/max78000_gcr.c index 6d2e2bd6176..e8dc5937329 100644 --- a/hw/misc/max78000_gcr.c +++ b/hw/misc/max78000_gcr.c @@ -12,7 +12,7 @@ #include "hw/core/irq.h" #include "system/runstate.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/char/max78000_uart.h" #include "hw/misc/max78000_trng.h" #include "hw/misc/max78000_aes.h" diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c index 5484b739674..1c6e9d1f6f0 100644 --- a/hw/misc/mips_cmgcr.c +++ b/hw/misc/mips_cmgcr.c @@ -16,7 +16,7 @@ #include "migration/vmstate.h" #include "hw/misc/mips_cmgcr.h" #include "hw/misc/mips_cpc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/mips_gic.h" =20 static inline bool is_cpc_connected(MIPSGCRState *s) diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c index 9bfb7c97219..efc0326f6f2 100644 --- a/hw/misc/mips_cpc.c +++ b/hw/misc/mips_cpc.c @@ -26,7 +26,7 @@ #include "migration/vmstate.h" =20 #include "hw/misc/mips_cpc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 static inline uint64_t cpc_vp_run_mask(MIPSCPCState *cpc) { diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c index fc17385cde7..82c0a90f704 100644 --- a/hw/misc/mips_itu.c +++ b/hw/misc/mips_itu.c @@ -24,7 +24,7 @@ #include "qapi/error.h" #include "hw/core/cpu.h" #include "hw/misc/mips_itu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "target/mips/cpu.h" =20 #define ITC_TAG_ADDRSPACE_SZ (ITC_ADDRESSMAP_NUM * 8) diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index 728931883d8..bae766ef178 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/misc/mos6522.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "monitor/monitor.h" #include "monitor/hmp.h" diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c index bee1309f5a6..f3d51fd2286 100644 --- a/hw/misc/mps2-fpgaio.c +++ b/hw/misc/mps2-fpgaio.c @@ -25,7 +25,7 @@ #include "hw/registerfields.h" #include "hw/misc/mps2-fpgaio.h" #include "hw/misc/led.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/timer.h" =20 REG32(LED0, 0) diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index ea9cad85dc2..56aa0135072 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -28,7 +28,7 @@ #include "hw/registerfields.h" #include "hw/misc/mps2-scc.h" #include "hw/misc/led.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 REG32(CFG0, 0) REG32(CFG1, 4) diff --git a/hw/misc/msf2-sysreg.c b/hw/misc/msf2-sysreg.c index ce0ad50c1be..90c786e95ad 100644 --- a/hw/misc/msf2-sysreg.c +++ b/hw/misc/msf2-sysreg.c @@ -17,7 +17,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/misc/msf2-sysreg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "trace.h" diff --git a/hw/misc/npcm7xx_mft.c b/hw/misc/npcm7xx_mft.c index 0bbae111cf9..21e74385c71 100644 --- a/hw/misc/npcm7xx_mft.c +++ b/hw/misc/npcm7xx_mft.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/npcm7xx_mft.h" #include "hw/misc/npcm7xx_pwm.h" #include "hw/registerfields.h" diff --git a/hw/misc/npcm7xx_pwm.c b/hw/misc/npcm7xx_pwm.c index 39ac0dbe2a5..1b010e51ec0 100644 --- a/hw/misc/npcm7xx_pwm.c +++ b/hw/misc/npcm7xx_pwm.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/npcm7xx_pwm.h" #include "hw/registerfields.h" #include "migration/vmstate.h" diff --git a/hw/misc/npcm_gcr.c b/hw/misc/npcm_gcr.c index 2acaa167713..2d7e5b5a015 100644 --- a/hw/misc/npcm_gcr.c +++ b/hw/misc/npcm_gcr.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" =20 #include "hw/misc/npcm_gcr.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/cutils.h" diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c index 0254fb377a6..37c832d976c 100644 --- a/hw/misc/nrf51_rng.c +++ b/hw/misc/nrf51_rng.c @@ -16,7 +16,7 @@ #include "hw/arm/nrf51.h" #include "hw/core/irq.h" #include "hw/misc/nrf51_rng.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/guest-random.h" =20 diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c index ba71c5069ff..3c3887afe0d 100644 --- a/hw/misc/pci-testdev.c +++ b/hw/misc/pci-testdev.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/event_notifier.h" #include "qemu/module.h" #include "system/kvm.h" diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c index f7b421c713b..85fb7da5e5c 100644 --- a/hw/misc/pvpanic-isa.c +++ b/hw/misc/pvpanic-isa.c @@ -17,7 +17,7 @@ #include "system/runstate.h" =20 #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/pvpanic.h" #include "qom/object.h" #include "hw/isa/isa.h" diff --git a/hw/misc/pvpanic-mmio.c b/hw/misc/pvpanic-mmio.c index 2a363106b2d..2d1464435a8 100644 --- a/hw/misc/pvpanic-mmio.c +++ b/hw/misc/pvpanic-mmio.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/pvpanic.h" #include "hw/sysbus.h" #include "standard-headers/misc/pvpanic.h" diff --git a/hw/misc/pvpanic-pci.c b/hw/misc/pvpanic-pci.c index 2869b6a7ff8..5509f70a3e5 100644 --- a/hw/misc/pvpanic-pci.c +++ b/hw/misc/pvpanic-pci.c @@ -16,7 +16,7 @@ #include "system/runstate.h" =20 #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/misc/pvpanic.h" #include "qom/object.h" diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index c83247c4087..bbd06d9accd 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -18,7 +18,7 @@ #include "system/runstate.h" =20 #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/pvpanic.h" #include "qom/object.h" #include "standard-headers/misc/pvpanic.h" diff --git a/hw/misc/sifive_e_aon.c b/hw/misc/sifive_e_aon.c index 9b1e7baf95e..4d6e015ca38 100644 --- a/hw/misc/sifive_e_aon.c +++ b/hw/misc/sifive_e_aon.c @@ -25,7 +25,7 @@ #include "qapi/visitor.h" #include "qapi/error.h" #include "system/watchdog.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 REG32(AON_WDT_WDOGCFG, 0x0) FIELD(AON_WDT_WDOGCFG, SCALE, 0, 4) diff --git a/hw/misc/sifive_u_otp.c b/hw/misc/sifive_u_otp.c index 1ebed2fd8b4..1d352680468 100644 --- a/hw/misc/sifive_u_otp.c +++ b/hw/misc/sifive_u_otp.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c index 1b012d1cc1e..c2b25e9a4de 100644 --- a/hw/misc/stm32l4x5_rcc.c +++ b/hw/misc/stm32l4x5_rcc.c @@ -26,7 +26,7 @@ #include "hw/core/clock.h" #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/registerfields.h" #include "trace.h" diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c index d922639da17..fb5d232bff5 100644 --- a/hw/misc/tz-mpc.c +++ b/hw/misc/tz-mpc.c @@ -19,7 +19,7 @@ #include "hw/registerfields.h" #include "hw/core/irq.h" #include "hw/misc/tz-mpc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 /* Our IOMMU has two IOMMU indexes, one for secure transactions and one for * non-secure transactions. diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c index 74c31f6d7d2..3e33455d421 100644 --- a/hw/misc/tz-msc.c +++ b/hw/misc/tz-msc.c @@ -19,7 +19,7 @@ #include "hw/registerfields.h" #include "hw/core/irq.h" #include "hw/misc/tz-msc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 static void tz_msc_update_irq(TZMSC *s) { diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c index 2ab03fa9730..a41c6011fba 100644 --- a/hw/misc/tz-ppc.c +++ b/hw/misc/tz-ppc.c @@ -19,7 +19,7 @@ #include "hw/registerfields.h" #include "hw/core/irq.h" #include "hw/misc/tz-ppc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 static void tz_ppc_update_irq(TZPPC *s) { diff --git a/hw/misc/virt_ctrl.c b/hw/misc/virt_ctrl.c index 9f16093ca2c..7cb1ea5d181 100644 --- a/hw/misc/virt_ctrl.c +++ b/hw/misc/virt_ctrl.c @@ -5,7 +5,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-= reg.c index 616c0ecf837..33a4ece26f6 100644 --- a/hw/misc/xlnx-versal-cframe-reg.c +++ b/hw/misc/xlnx-versal-cframe-reg.c @@ -16,7 +16,7 @@ #include "qemu/log.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/misc/xlnx-versal-cframe-reg.h" diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c index ce58404eb2c..80f9612b2ff 100644 --- a/hw/misc/xlnx-versal-cfu.c +++ b/hw/misc/xlnx-versal-cfu.c @@ -18,7 +18,7 @@ #include "qemu/log.h" #include "qemu/units.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/misc/xlnx-versal-cfu.h" =20 diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c index 8f9a40d941d..b0baabc1adf 100644 --- a/hw/misc/xlnx-versal-crl.c +++ b/hw/misc/xlnx-versal-crl.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/register.h" diff --git a/hw/misc/xlnx-versal-pmc-iou-slcr.c b/hw/misc/xlnx-versal-pmc-i= ou-slcr.c index c75800c1b3c..84d474c38fc 100644 --- a/hw/misc/xlnx-versal-pmc-iou-slcr.c +++ b/hw/misc/xlnx-versal-pmc-iou-slcr.c @@ -30,7 +30,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/xlnx-versal-pmc-iou-slcr.h" =20 #ifndef XILINX_VERSAL_PMC_IOU_SLCR_ERR_DEBUG diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c index 2b573a45bdb..aa1d65de7b7 100644 --- a/hw/misc/xlnx-versal-trng.c +++ b/hw/misc/xlnx-versal-trng.c @@ -35,7 +35,7 @@ #include "qemu/timer.h" #include "qapi/visitor.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #ifndef XLNX_VERSAL_TRNG_ERR_DEBUG #define XLNX_VERSAL_TRNG_ERR_DEBUG 0 diff --git a/hw/misc/xlnx-versal-xramc.c b/hw/misc/xlnx-versal-xramc.c index af58bc761f3..6a86f6b5d48 100644 --- a/hw/misc/xlnx-versal-xramc.c +++ b/hw/misc/xlnx-versal-xramc.c @@ -12,7 +12,7 @@ #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/register.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/irq.h" #include "hw/misc/xlnx-versal-xramc.h" =20 diff --git a/hw/misc/xlnx-zynqmp-apu-ctrl.c b/hw/misc/xlnx-zynqmp-apu-ctrl.c index 196e2452ae3..93f0bedc48e 100644 --- a/hw/misc/xlnx-zynqmp-apu-ctrl.c +++ b/hw/misc/xlnx-zynqmp-apu-ctrl.c @@ -12,7 +12,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/register.h" diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index cc18b21b22b..d1900a2b948 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -24,7 +24,7 @@ #include "hw/registerfields.h" #include "hw/core/qdev-clock.h" #include "qom/object.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" =20 #ifndef ZYNQ_SLCR_ERR_DEBUG diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c index a4824d61bda..8ff0db5ccdc 100644 --- a/hw/net/allwinner-sun8i-emac.c +++ b/hw/net/allwinner-sun8i-emac.c @@ -24,7 +24,7 @@ #include "migration/vmstate.h" #include "net/net.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "trace.h" #include "net/checksum.h" diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c index 9158c77cb4f..cbe4cb80e4a 100644 --- a/hw/net/allwinner_emac.c +++ b/hw/net/allwinner_emac.c @@ -24,7 +24,7 @@ #include "qemu/fifo8.h" #include "hw/core/irq.h" #include "hw/net/allwinner_emac.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" #include diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index ef72821f8d7..fe9747fdb6f 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -27,7 +27,7 @@ =20 #include "hw/core/irq.h" #include "hw/net/cadence_gem.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c index 52584c5d6fa..f2912b206da 100644 --- a/hw/net/can/can_kvaser_pci.c +++ b/hw/net/can/can_kvaser_pci.c @@ -34,7 +34,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/can_emu.h" =20 diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c index 2e9e09741b2..fe1a91ee0e7 100644 --- a/hw/net/can/can_mioe3680_pci.c +++ b/hw/net/can/can_mioe3680_pci.c @@ -30,7 +30,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/can_emu.h" =20 diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c index 7dd23c905e5..ea45de28a82 100644 --- a/hw/net/can/can_pcm3680_pci.c +++ b/hw/net/can/can_pcm3680_pci.c @@ -30,7 +30,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/can_emu.h" =20 diff --git a/hw/net/can/ctucan_pci.c b/hw/net/can/ctucan_pci.c index ad2b1e60cb4..40654778a45 100644 --- a/hw/net/can/ctucan_pci.c +++ b/hw/net/can/ctucan_pci.c @@ -31,7 +31,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/can_emu.h" =20 diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 07342795575..94d9178a540 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -36,7 +36,7 @@ #include "hw/register.h" #include "qapi/error.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/net/xlnx-versal-canfd.h" #include "trace.h" diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c index a98b208169f..533ac854a2f 100644 --- a/hw/net/can/xlnx-zynqmp-can.c +++ b/hw/net/can/xlnx-zynqmp-can.c @@ -38,7 +38,7 @@ #include "qemu/log.h" #include "qemu/cutils.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "net/can_emu.h" #include "net/can_host.h" #include "qemu/event_notifier.h" diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 68062481c59..182f0e5f6b1 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/net/dp8393x.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/net/e1000.c b/hw/net/e1000.c index a80a7b0cdb4..202ad404013 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "hw/net/mii.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/eth.h" #include "net/net.h" diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 89e6d52ba0f..3d4683370c6 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -45,7 +45,7 @@ #include "hw/net/mii.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 #include "e1000_common.h" diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index d47df5a97fd..aaa3eb60f8a 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -45,7 +45,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index e6a29d9ec6d..5b77528e365 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -31,7 +31,7 @@ #include "hw/core/irq.h" #include "hw/net/mii.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "etsec.h" #include "registers.h" #include "qapi/error.h" diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index d5590391b7f..d29f7dcd171 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -21,7 +21,7 @@ #include "net/checksum.h" #include "net/eth.h" #include "hw/net/mii.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 #include /* for crc32 */ diff --git a/hw/net/i82596.c b/hw/net/i82596.c index a94cfa2d6df..37ce20efb19 100644 --- a/hw/net/i82596.c +++ b/hw/net/i82596.c @@ -41,7 +41,7 @@ #include "net/net.h" #include "net/eth.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/address-spaces.h" #include "qemu/module.h" diff --git a/hw/net/igb.c b/hw/net/igb.c index e4c02365d67..d39eba9f64d 100644 --- a/hw/net/igb.c +++ b/hw/net/igb.c @@ -52,7 +52,7 @@ #include "hw/pci/pcie_sriov.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 #include "igb_common.h" diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 386d24421cb..c177b7ff2b7 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/net/imx_fec.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/dma.h" #include "qemu/log.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index 191fd8b421b..381fd387641 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -19,7 +19,7 @@ #include "hw/net/lan9118_phy.h" #include "hw/net/lan9118.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/bswap.h" #include "qemu/log.h" diff --git a/hw/net/lance.c b/hw/net/lance.c index dfb855c23a4..5d5bf9b9616 100644 --- a/hw/net/lance.c +++ b/hw/net/lance.c @@ -41,7 +41,7 @@ #include "hw/sparc/sparc32_dma.h" #include "migration/vmstate.h" #include "hw/net/lance.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "system/system.h" =20 diff --git a/hw/net/lasi_i82596.c b/hw/net/lasi_i82596.c index 2f212a7ed38..50e3c4fa86d 100644 --- a/hw/net/lasi_i82596.c +++ b/hw/net/lasi_i82596.c @@ -19,7 +19,7 @@ #include "hw/net/lasi_82596.h" #include "hw/net/i82596.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 #define PA_I82596_RESET 0 /* Offsets relative to LASI-LAN-Ad= dr.*/ diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index 9cd94369859..ecf105adf2e 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -14,7 +14,7 @@ #include "hw/m68k/mcf.h" #include "hw/m68k/mcf_fec.h" #include "hw/net/mii.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include /* for crc32 */ =20 diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c index 3e279209628..ac01d1ce472 100644 --- a/hw/net/msf2-emac.c +++ b/hw/net/msf2-emac.c @@ -35,7 +35,7 @@ #include "hw/net/msf2-emac.h" #include "hw/net/mii.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 REG32(CFG1, 0x0) diff --git a/hw/net/mv88w8618_eth.c b/hw/net/mv88w8618_eth.c index 68fda839660..1a1bba8b572 100644 --- a/hw/net/mv88w8618_eth.c +++ b/hw/net/mv88w8618_eth.c @@ -7,7 +7,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/net/mv88w8618_eth.h" diff --git a/hw/net/ne2000-pci.c b/hw/net/ne2000-pci.c index 7b215eb1f2e..f741478101d 100644 --- a/hw/net/ne2000-pci.c +++ b/hw/net/ne2000-pci.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "ne2000.h" #include "system/system.h" diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c index 704f4387684..4105e894297 100644 --- a/hw/net/npcm7xx_emc.c +++ b/hw/net/npcm7xx_emc.c @@ -33,7 +33,7 @@ =20 #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/net/npcm7xx_emc.h" #include "net/eth.h" #include "migration/vmstate.h" diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index 85419321d94..34992f3cc9f 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -34,7 +34,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/net/mii.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "net/net.h" #include "qemu/module.h" diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index dad5d2ab06d..bef608959a6 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -30,7 +30,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/net.h" #include "qemu/module.h" diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index fc2ce5eeb2d..0bd7d4314e7 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -38,7 +38,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index cc49701dd3c..935e74fd7d1 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -17,7 +17,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/pci/msix.h" diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 324fb932aac..9fd00574d29 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -52,7 +52,7 @@ #include /* for crc32 */ =20 #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/dma.h" #include "qemu/module.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index b1c675be6fc..e3bf3b0e726 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -14,7 +14,7 @@ #include "hw/core/irq.h" #include "hw/net/smc91c111.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c index f6f217d6320..550848307d1 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -32,7 +32,7 @@ #include "migration/vmstate.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/system.h" #include "trace.h" =20 diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index a05aa8a024c..c97d6945852 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" diff --git a/hw/net/sungem.c b/hw/net/sungem.c index b405eb89fa5..308c2d0dbd0 100644 --- a/hw/net/sungem.c +++ b/hw/net/sungem.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c index c2f7a8483da..e2cd1b52710 100644 --- a/hw/net/sunhme.c +++ b/hw/net/sunhme.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/net/mii.h" #include "net/net.h" diff --git a/hw/net/tulip.c b/hw/net/tulip.c index 5f9df76a74e..bc7b18ed36d 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -10,7 +10,7 @@ #include "qemu/log.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/nvram/eeprom93xx.h" #include "migration/vmstate.h" #include "system/system.h" diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index f5d93eb4005..3ded9ab8011 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -33,7 +33,7 @@ #include "hw/virtio/virtio-bus.h" #include "qapi/error.h" #include "qapi/qapi-events-net.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/qapi-types-migration.h" #include "qapi/qapi-events-migration.h" #include "hw/virtio/virtio-access.h" diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 03732375a76..bae3a44cb0c 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "net/tap.h" #include "net/checksum.h" #include "system/system.h" diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index e7bdc732de0..4ef1b7dd29a 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -37,7 +37,7 @@ =20 #include "hw/xen/xen-backend.h" #include "hw/xen/xen-bus-helper.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" =20 #include "hw/xen/interface/io/netif.h" diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index 25768644f58..f07be725120 100644 --- a/hw/net/xgmac.c +++ b/hw/net/xgmac.c @@ -26,7 +26,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index c7cb257e62d..36047a51c00 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -32,7 +32,7 @@ #include "net/checksum.h" =20 #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/stream.h" #include "qom/object.h" =20 diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 0d00e3cc0d9..39e64a46e26 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -33,7 +33,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/misc/unimp.h" #include "net/net.h" diff --git a/hw/nvram/aspeed_otp.c b/hw/nvram/aspeed_otp.c index dcf8ed3917e..a60289000c3 100644 --- a/hw/nvram/aspeed_otp.c +++ b/hw/nvram/aspeed_otp.c @@ -10,7 +10,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "system/block-backend.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/nvram/aspeed_otp.h" #include "hw/nvram/trace.h" =20 diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c index 0945e36652e..512e5485187 100644 --- a/hw/nvram/ds1225y.c +++ b/hw/nvram/ds1225y.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index 82ea97e552a..e947cf8a3b2 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "hw/i2c/i2c.h" #include "hw/nvram/eeprom_at24c.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "system/block-backend.h" #include "qom/object.h" diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index df07424e553..e5c35b0e2e4 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -30,7 +30,7 @@ #include "system/address-spaces.h" #include "hw/core/boards.h" #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c index 66526a22914..b048db0777a 100644 --- a/hw/nvram/mac_nvram.c +++ b/hw/nvram/mac_nvram.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "hw/nvram/chrp_nvram.h" #include "hw/nvram/mac_nvram.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "system/block-backend.h" #include "migration/vmstate.h" diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c index 23cc9fe9b3d..b841ead579d 100644 --- a/hw/nvram/nrf51_nvm.c +++ b/hw/nvram/nrf51_nvm.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "hw/arm/nrf51.h" #include "hw/nvram/nrf51_nvm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 /* diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c index d0ac4e5735f..c9202ddfcd4 100644 --- a/hw/nvram/spapr_nvram.c +++ b/hw/nvram/spapr_nvram.c @@ -36,7 +36,7 @@ #include "hw/nvram/chrp_nvram.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qom/object.h" =20 diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c index 22aefbc240d..aad445b9018 100644 --- a/hw/nvram/xlnx-bbram.c +++ b/hw/nvram/xlnx-bbram.c @@ -31,7 +31,7 @@ #include "qapi/error.h" #include "system/blockdev.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/nvram/xlnx-efuse.h" =20 diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c index 4c23f8b9312..7eb156f9413 100644 --- a/hw/nvram/xlnx-efuse.c +++ b/hw/nvram/xlnx-efuse.c @@ -31,7 +31,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "system/blockdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" =20 #define TBIT0_OFFSET 28 diff --git a/hw/nvram/xlnx-versal-efuse-cache.c b/hw/nvram/xlnx-versal-efus= e-cache.c index d4ec96a6264..56c2def5f89 100644 --- a/hw/nvram/xlnx-versal-efuse-cache.c +++ b/hw/nvram/xlnx-versal-efuse-cache.c @@ -26,7 +26,7 @@ #include "hw/nvram/xlnx-versal-efuse.h" =20 #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #define MR_SIZE 0xC00 =20 diff --git a/hw/nvram/xlnx-versal-efuse-ctrl.c b/hw/nvram/xlnx-versal-efuse= -ctrl.c index 6f17f32a0c3..b7dc0e49e5f 100644 --- a/hw/nvram/xlnx-versal-efuse-ctrl.c +++ b/hw/nvram/xlnx-versal-efuse-ctrl.c @@ -29,7 +29,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #ifndef XLNX_VERSAL_EFUSE_CTRL_ERR_DEBUG #define XLNX_VERSAL_EFUSE_CTRL_ERR_DEBUG 0 diff --git a/hw/nvram/xlnx-zynqmp-efuse.c b/hw/nvram/xlnx-zynqmp-efuse.c index ce35bb0cc1f..e6bc54fc6bd 100644 --- a/hw/nvram/xlnx-zynqmp-efuse.c +++ b/hw/nvram/xlnx-zynqmp-efuse.c @@ -31,7 +31,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #ifndef ZYNQMP_EFUSE_ERR_DEBUG #define ZYNQMP_EFUSE_ERR_DEBUG 0 diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index a42e7b5e271..bafb877cc38 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -27,7 +27,7 @@ #include "hw/char/serial-mm.h" #include "net/net.h" #include "hw/openrisc/boot.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/address-spaces.h" #include "system/device_tree.h" #include "system/system.h" diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c index bc5d27dbdd8..446a81579c1 100644 --- a/hw/openrisc/virt.c +++ b/hw/openrisc/virt.c @@ -20,7 +20,7 @@ #include "hw/misc/sifive_test.h" #include "hw/pci/pci.h" #include "hw/pci-host/gpex.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/rtc/goldfish_rtc.h" #include "hw/sysbus.h" #include "hw/virtio/virtio-mmio.h" diff --git a/hw/pci-bridge/cxl_downstream.c b/hw/pci-bridge/cxl_downstream.c index 1065245a8b8..1265e40c395 100644 --- a/hw/pci-bridge/cxl_downstream.c +++ b/hw/pci-bridge/cxl_downstream.c @@ -13,7 +13,7 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/cxl/cxl.h" #include "qapi/error.h" diff --git a/hw/pci-bridge/cxl_root_port.c b/hw/pci-bridge/cxl_root_port.c index e6a4035d26c..df359dee670 100644 --- a/hw/pci-bridge/cxl_root_port.c +++ b/hw/pci-bridge/cxl_root_port.c @@ -23,7 +23,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/pcie_port.h" #include "hw/pci/msi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" #include "qapi/error.h" diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c index 208e0c6172e..019c311bb5b 100644 --- a/hw/pci-bridge/cxl_upstream.c +++ b/hw/pci-bridge/cxl_upstream.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/pci/msi.h" #include "hw/pci/pcie.h" diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_ro= ot_port.c index d9078e783bf..fa1cf5e58fd 100644 --- a/hw/pci-bridge/gen_pcie_root_port.c +++ b/hw/pci-bridge/gen_pcie_root_port.c @@ -15,7 +15,7 @@ #include "qemu/module.h" #include "hw/pci/msix.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c index cb4809f38b1..0c1383562d9 100644 --- a/hw/pci-bridge/pci_bridge_dev.c +++ b/hw/pci-bridge/pci_bridge_dev.c @@ -27,7 +27,7 @@ #include "hw/pci/msi.h" #include "hw/pci/shpc.h" #include "hw/pci/slotid_cap.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/memory.h" #include "hw/pci/pci_bus.h" #include "hw/core/hotplug.h" diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index b3a5f16e22a..08d40aa2eae 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -16,7 +16,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/pci_bridge.h" #include "hw/pci-bridge/pci_expander_bridge.h" #include "hw/cxl/cxl.h" diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridg= e.c index fce292a519b..e826fb2829f 100644 --- a/hw/pci-bridge/pcie_pci_bridge.c +++ b/hw/pci-bridge/pcie_pci_bridge.c @@ -16,7 +16,7 @@ #include "hw/pci/msi.h" #include "hw/pci/shpc.h" #include "hw/pci/slotid_cap.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" =20 struct PCIEPCIBridge { diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c index 22c2fdb71e7..fe3ced56851 100644 --- a/hw/pci-bridge/pcie_root_port.c +++ b/hw/pci-bridge/pcie_root_port.c @@ -16,7 +16,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 static void rp_aer_vector_update(PCIDevice *d) { diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_dow= nstream.c index dc7d1aa7d77..0c3fed3053b 100644 --- a/hw/pci-bridge/xio3130_downstream.c +++ b/hw/pci-bridge/xio3130_downstream.c @@ -24,7 +24,7 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/pci-host/aspeed_pcie.c b/hw/pci-host/aspeed_pcie.c index 5d837f638c2..27f1078e3a5 100644 --- a/hw/pci-host/aspeed_pcie.c +++ b/hw/pci-host/aspeed_pcie.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "hw/core/irq.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c index b54f6ef2d53..00a904277c0 100644 --- a/hw/pci-host/astro.c +++ b/hw/pci-host/astro.c @@ -28,7 +28,7 @@ #include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci-host/astro.h" #include "hw/hppa/hppa_hardware.h" #include "migration/vmstate.h" diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index 5a80502abb7..019e0253820 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -26,7 +26,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/pci-host/designware.h" diff --git a/hw/pci-host/dino.c b/hw/pci-host/dino.c index e6fdb927f5e..4e64e0f553a 100644 --- a/hw/pci-host/dino.c +++ b/hw/pci-host/dino.c @@ -17,7 +17,7 @@ #include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci-host/dino.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 3db4c8c9f05..b5074c05c00 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -34,7 +34,7 @@ #include "hw/core/irq.h" #include "hw/pci/pci_bus.h" #include "hw/pci-host/gpex.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" =20 diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c index 85a4b83228a..9a58f0e9b56 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -24,7 +24,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/pci_device.h" #include "hw/core/irq.h" #include "qapi/error.h" diff --git a/hw/pci-host/gt64120.c b/hw/pci-host/gt64120.c index 3e497b5da5b..2339f10a30a 100644 --- a/hw/pci-host/gt64120.c +++ b/hw/pci-host/gt64120.c @@ -29,7 +29,7 @@ #include "qemu/units.h" #include "qemu/log.h" #include "qemu/bswap.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index e13bb1b53e4..15354abf3ba 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -29,7 +29,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/pci-host/i440fx.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "migration/vmstate.h" diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c index 9f080e4825a..636228c4074 100644 --- a/hw/pci-host/mv64361.c +++ b/hw/pci-host/mv64361.c @@ -16,7 +16,7 @@ #include "hw/pci/pci_host.h" #include "hw/core/irq.h" #include "hw/intc/i8259.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/address-spaces.h" #include "qemu/log.h" #include "qemu/error-report.h" diff --git a/hw/pci-host/pnv_phb.c b/hw/pci-host/pnv_phb.c index 4b0ced79b08..85fcc3b6868 100644 --- a/hw/pci-host/pnv_phb.c +++ b/hw/pci-host/pnv_phb.c @@ -15,7 +15,7 @@ #include "hw/pci-host/pnv_phb3.h" #include "hw/pci-host/pnv_phb4.h" #include "hw/ppc/pnv.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" #include "system/system.h" =20 diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c index 9808d575509..d6ab5153374 100644 --- a/hw/pci-host/pnv_phb3.c +++ b/hw/pci-host/pnv_phb3.c @@ -19,7 +19,7 @@ #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" #include "system/system.h" =20 diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c index f6bf4e323a9..66ba7b79134 100644 --- a/hw/pci-host/pnv_phb3_msi.c +++ b/hw/pci-host/pnv_phb3_msi.c @@ -14,7 +14,7 @@ #include "hw/ppc/pnv.h" #include "hw/pci/msi.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/reset.h" =20 static uint64_t phb3_msi_ive_addr(PnvPHB3 *phb, int srcno) diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c index 9f17fc1bb41..396bc47817d 100644 --- a/hw/pci-host/pnv_phb4.c +++ b/hw/pci-host/pnv_phb4.c @@ -19,7 +19,7 @@ #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" #include "trace.h" =20 diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c index 5bac1c42ed0..58ec14ec2fc 100644 --- a/hw/pci-host/pnv_phb4_pec.c +++ b/hw/pci-host/pnv_phb4_pec.c @@ -18,7 +18,7 @@ #include "hw/pci/pci_bus.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/system.h" =20 #include diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index a8e172136eb..76623f78c46 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -16,7 +16,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index a708758d361..bf562290514 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -32,7 +32,7 @@ #include "qemu/log.h" #include "hw/i386/pc.h" #include "hw/pci-host/q35.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index a587f16131b..c50061996c7 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -30,7 +30,7 @@ #include "hw/pci/pci_device.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/i8259.h" #include "hw/core/irq.h" #include "hw/core/or-irq.h" diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c index e6d2af4502a..feaaa9adaa1 100644 --- a/hw/pci-host/remote.c +++ b/hw/pci-host/remote.c @@ -26,7 +26,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/pci/pcie_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci-host/remote.h" #include "system/memory.h" =20 diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c index c2f99b76f80..87af933dc29 100644 --- a/hw/pci-host/sabre.c +++ b/hw/pci-host/sabre.c @@ -28,7 +28,7 @@ #include "hw/sysbus.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" #include "hw/core/irq.h" diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index 7a25f3f39f5..d39546b6f42 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 40dce72e674..1fdae78210a 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -15,7 +15,7 @@ #include "hw/pci/pci_device.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index ac6e61c83b0..86c20377d19 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -22,7 +22,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "hw/pci/pci_bridge.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/irq.h" #include "hw/pci-host/xilinx-pcie.h" =20 diff --git a/hw/pci/pci.c b/hw/pci/pci.c index a3118ac6d0d..2371a916809 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -30,7 +30,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/cpr.h" #include "migration/qemu-file-types.h" diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c index 76255c4cd89..e85932e41a9 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -38,7 +38,7 @@ #include "qapi/error.h" #include "hw/acpi/acpi_aml_interface.h" #include "hw/acpi/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 /* PCI bridge subsystem vendor ID helper functions */ #define PCI_SSVID_SIZEOF 8 diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c index 7179d99178b..05f1475dc74 100644 --- a/hw/pci/pci_host.c +++ b/hw/pci/pci_host.c @@ -22,7 +22,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "hw/pci/pci_bus.h" #include "migration/vmstate.h" diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c index 20b5e4cfb51..dbb6032160e 100644 --- a/hw/pci/pcie_port.c +++ b/hw/pci/pcie_port.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "hw/core/hotplug.h" =20 diff --git a/hw/pci/pcie_sriov.c b/hw/pci/pcie_sriov.c index c4f88f09757..34e0875d210 100644 --- a/hw/pci/pcie_sriov.c +++ b/hw/pci/pcie_sriov.c @@ -14,7 +14,7 @@ #include "hw/pci/pci_device.h" #include "hw/pci/pcie.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/range.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 7c65757e215..7f164331c8e 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -38,7 +38,7 @@ #include "hw/ppc/openpic.h" #include "hw/ppc/openpic_kvm.h" #include "hw/ppc/ppc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/loader.h" #include "elf.h" #include "hw/sysbus.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 909a4fe257d..410a3ac392e 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -52,7 +52,7 @@ #include "qapi/error.h" #include "exec/target_page.h" #include "hw/ppc/ppc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/nvram/mac_nvram.h" #include "hw/core/boards.h" #include "hw/pci-host/uninorth.h" diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 8400db6c352..e679d338985 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -30,7 +30,7 @@ #include "qapi/error.h" #include "exec/target_page.h" #include "hw/ppc/ppc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "hw/input/adb.h" #include "system/system.h" diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c index 2de80a5fae9..bf290a7dcd5 100644 --- a/hw/ppc/pegasos.c +++ b/hw/ppc/pegasos.c @@ -20,7 +20,7 @@ #include "hw/isa/vt82c686.h" #include "hw/ide/pci.h" #include "hw/i2c/smbus_eeprom.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/reset.h" #include "system/runstate.h" #include "system/qtest.h" diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 8a50e9f0d85..f891c3a797c 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -50,7 +50,7 @@ #include "hw/pci-host/pnv_phb4.h" =20 #include "hw/ppc/xics.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv_chip.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_pnor.h" diff --git a/hw/ppc/pnv_adu.c b/hw/ppc/pnv_adu.c index 005fbda4750..d686bfa62d9 100644 --- a/hw/ppc/pnv_adu.c +++ b/hw/ppc/pnv_adu.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_adu.h" #include "hw/ppc/pnv_chip.h" diff --git a/hw/ppc/pnv_chiptod.c b/hw/ppc/pnv_chiptod.c index 540d5e365f4..09a5a52ac72 100644 --- a/hw/ppc/pnv_chiptod.c +++ b/hw/ppc/pnv_chiptod.c @@ -29,7 +29,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/fdt.h" #include "hw/ppc/ppc.h" #include "hw/ppc/pnv.h" diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index fb2dfc7ba21..59a9eee597c 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -29,7 +29,7 @@ #include "hw/ppc/pnv_core.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/xics.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "helper_regs.h" =20 static const char *pnv_core_cpu_typename(PnvCore *pc) diff --git a/hw/ppc/pnv_homer.c b/hw/ppc/pnv_homer.c index fb394cc6e09..1683513daca 100644 --- a/hw/ppc/pnv_homer.c +++ b/hw/ppc/pnv_homer.c @@ -23,7 +23,7 @@ #include "system/memory.h" #include "system/cpus.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" #include "hw/ppc/pnv_homer.h" diff --git a/hw/ppc/pnv_i2c.c b/hw/ppc/pnv_i2c.c index 213e58b455c..c8e90c636f4 100644 --- a/hw/ppc/pnv_i2c.c +++ b/hw/ppc/pnv_i2c.c @@ -12,7 +12,7 @@ #include "system/reset.h" =20 #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c index 538681bdb32..3b65c123164 100644 --- a/hw/ppc/pnv_lpc.c +++ b/hw/ppc/pnv_lpc.c @@ -24,7 +24,7 @@ #include "qemu/module.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" #include "hw/ppc/pnv_lpc.h" diff --git a/hw/ppc/pnv_n1_chiplet.c b/hw/ppc/pnv_n1_chiplet.c index 053f6473f22..c75ac671d36 100644 --- a/hw/ppc/pnv_n1_chiplet.c +++ b/hw/ppc/pnv_n1_chiplet.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_n1_chiplet.h" diff --git a/hw/ppc/pnv_nest_pervasive.c b/hw/ppc/pnv_nest_pervasive.c index 1b1b14fed95..01119e667c3 100644 --- a/hw/ppc/pnv_nest_pervasive.c +++ b/hw/ppc/pnv_nest_pervasive.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_nest_pervasive.h" diff --git a/hw/ppc/pnv_occ.c b/hw/ppc/pnv_occ.c index 7e93e6a6b11..64cab3e9dc8 100644 --- a/hw/ppc/pnv_occ.c +++ b/hw/ppc/pnv_occ.c @@ -22,7 +22,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" #include "hw/ppc/pnv_xscom.h" diff --git a/hw/ppc/pnv_pnor.c b/hw/ppc/pnv_pnor.c index c7cbc525b33..1083e42ab57 100644 --- a/hw/ppc/pnv_pnor.c +++ b/hw/ppc/pnv_pnor.c @@ -15,7 +15,7 @@ #include "system/blockdev.h" #include "hw/core/loader.h" #include "hw/ppc/pnv_pnor.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" =20 static uint64_t pnv_pnor_read(void *opaque, hwaddr addr, unsigned size) diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index 1cea9375c0e..264568cdfb1 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -30,7 +30,7 @@ #include "hw/ppc/fdt.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv_psi.h" =20 #include diff --git a/hw/ppc/pnv_sbe.c b/hw/ppc/pnv_sbe.c index 4798e129983..27383ce6837 100644 --- a/hw/ppc/pnv_sbe.c +++ b/hw/ppc/pnv_sbe.c @@ -22,7 +22,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_sbe.h" diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 9e71037d84c..491560575c0 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -30,7 +30,7 @@ #include "system/reset.h" #include "hw/sysbus.h" #include "hw/intc/ppc-uic.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" =20 #include diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index fd9203d7e2a..fc6dd332e88 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -15,7 +15,7 @@ #include "hw/core/irq.h" #include "hw/ppc/ppc4xx.h" #include "hw/pci-host/ppc4xx.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/pci.h" #include "system/reset.h" #include "cpu.h" diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c index f36c519c8bf..1e6b6fec5da 100644 --- a/hw/ppc/ppc4xx_devs.c +++ b/hw/ppc/ppc4xx_devs.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "hw/ppc/ppc4xx.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" =20 /*************************************************************************= ****/ diff --git a/hw/ppc/ppc4xx_sdram.c b/hw/ppc/ppc4xx_sdram.c index 6cc2a82ac5c..b2c8f96d5f8 100644 --- a/hw/ppc/ppc4xx_sdram.c +++ b/hw/ppc/ppc4xx_sdram.c @@ -36,7 +36,7 @@ #include "qemu/error-report.h" #include "system/address-spaces.h" /* get_system_memory() */ #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/ppc4xx.h" #include "trace.h" =20 diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 90164face16..c4efd1d3908 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -39,7 +39,7 @@ #include "hw/core/loader.h" #include "hw/rtc/mc146818rtc.h" #include "hw/isa/pc87312.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "exec/target_page.h" #include "system/kvm.h" #include "system/reset.h" diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c index d0e42e8731a..bc8b0964e75 100644 --- a/hw/ppc/prep_systemio.c +++ b/hw/ppc/prep_systemio.c @@ -26,7 +26,7 @@ #include "qemu/log.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/address-spaces.h" #include "qom/object.h" diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c index a0964051d1e..d87afd6d5b4 100644 --- a/hw/ppc/rs6000_mc.c +++ b/hw/ppc/rs6000_mc.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/address-spaces.h" #include "qapi/error.h" diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 550aaa21fa2..b6e233747ed 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -37,7 +37,7 @@ #include "hw/ide/pci.h" #include "hw/usb/hcd-ehci.h" #include "hw/ppc/fdt.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/ppc-uic.h" =20 #include diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7363e533e15..eb626547ebd 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -68,7 +68,7 @@ #include "hw/ppc/spapr_nested.h" #include "hw/ppc/spapr_vio.h" #include "hw/ppc/vof.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci-host/spapr.h" #include "hw/pci/msi.h" =20 diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 4952f9bd2cf..41e37103c04 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/cpu/core.h" #include "hw/ppc/spapr_cpu_core.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "target/ppc/cpu.h" #include "hw/ppc/spapr.h" diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 32a2edbe5cc..3a9c96d939b 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -17,7 +17,7 @@ #include "hw/ppc/spapr_xive.h" #include "hw/ppc/xics.h" #include "hw/ppc/xics_spapr.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "cpu-models.h" #include "system/kvm.h" =20 diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c index 72b4a6329fb..66474283915 100644 --- a/hw/ppc/spapr_nvdimm.c +++ b/hw/ppc/spapr_nvdimm.c @@ -34,7 +34,7 @@ #include "block/thread-pool.h" #include "migration/vmstate.h" #include "qemu/pmem.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 /* DIMM health bitmap bitmap indicators. Taken from kernel's papr_scm.c */ /* SCM device is unable to persist memory contents */ diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 523edaa7b6c..a7c064be330 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -43,7 +43,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_ids.h" #include "hw/ppc/spapr_drc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/device_tree.h" #include "system/kvm.h" #include "system/hostmem.h" diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c index 6fec6070370..846ea3e3b6d 100644 --- a/hw/ppc/spapr_rng.c +++ b/hw/ppc/spapr_rng.c @@ -25,7 +25,7 @@ #include "system/device_tree.h" #include "system/rng.h" #include "hw/ppc/spapr.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "kvm_ppc.h" #include "qom/object.h" =20 diff --git a/hw/ppc/spapr_tpm_proxy.c b/hw/ppc/spapr_tpm_proxy.c index 1297b3ad569..a48dab7e7a6 100644 --- a/hw/ppc/spapr_tpm_proxy.c +++ b/hw/ppc/spapr_tpm_proxy.c @@ -15,7 +15,7 @@ #include "qemu/error-report.h" #include "system/reset.h" #include "hw/ppc/spapr.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" =20 #define TPM_SPAPR_BUFSIZE 4096 diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 8b5f4eb57a0..cf2d10ecb27 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -43,7 +43,7 @@ #include "hw/intc/ppc-uic.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #include =20 diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c index 18e0f7a064f..5081d67e7f4 100644 --- a/hw/remote/proxy.c +++ b/hw/remote/proxy.c @@ -12,7 +12,7 @@ #include "hw/pci/pci.h" #include "qapi/error.h" #include "io/channel-util.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "monitor/monitor.h" #include "migration/blocker.h" #include "qemu/sockets.h" diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c index 726df2daf1f..24a803f7fad 100644 --- a/hw/riscv/numa.c +++ b/hw/riscv/numa.c @@ -21,7 +21,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/riscv/numa.h" #include "system/device_tree.h" =20 diff --git a/hw/riscv/riscv-iommu-pci.c b/hw/riscv/riscv-iommu-pci.c index cdb4a7a8f03..5f7d3592047 100644 --- a/hw/riscv/riscv-iommu-pci.c +++ b/hw/riscv/riscv-iommu-pci.c @@ -21,7 +21,7 @@ #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/riscv/riscv_hart.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/riscv/riscv-iommu-sys.c b/hw/riscv/riscv-iommu-sys.c index 7d8c6f1c7c6..2a11c4dab6d 100644 --- a/hw/riscv/riscv-iommu-sys.c +++ b/hw/riscv/riscv-iommu-sys.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/riscv/riscv-iommu.c b/hw/riscv/riscv-iommu.c index f8656ec04b1..baaadadda10 100644 --- a/hw/riscv/riscv-iommu.c +++ b/hw/riscv/riscv-iommu.c @@ -21,7 +21,7 @@ #include "exec/target_page.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/riscv/riscv_hart.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c index 33cbc9873e6..31187487946 100644 --- a/hw/riscv/riscv_hart.c +++ b/hw/riscv/riscv_hart.c @@ -26,7 +26,7 @@ #include "qemu/cutils.h" #include "hw/sysbus.h" #include "target/riscv/cpu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/riscv/riscv_hart.h" #include "qemu/error-report.h" =20 diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c index d309ea2e39e..49a39b30212 100644 --- a/hw/riscv/shakti_c.c +++ b/hw/riscv/shakti_c.c @@ -24,7 +24,7 @@ #include "hw/intc/sifive_plic.h" #include "hw/intc/riscv_aclint.h" #include "system/system.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/address-spaces.h" #include "hw/riscv/boot.h" =20 diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 9cb4f16432e..d79add55768 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -26,7 +26,7 @@ #include "hw/core/boards.h" #include "hw/core/loader.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/char/serial-mm.h" #include "target/riscv/cpu.h" #include "hw/core/sysbus-fdt.h" diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c index e831954cb36..436e51c1c59 100644 --- a/hw/riscv/xiangshan_kmh.c +++ b/hw/riscv/xiangshan_kmh.c @@ -37,7 +37,7 @@ #include "hw/intc/riscv_aclint.h" #include "hw/intc/riscv_aplic.h" #include "hw/intc/riscv_imsic.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/riscv/boot.h" #include "hw/riscv/xiangshan_kmh.h" #include "hw/riscv/riscv_hart.h" diff --git a/hw/rtc/allwinner-rtc.c b/hw/rtc/allwinner-rtc.c index a747bff534c..0ffd38cf787 100644 --- a/hw/rtc/allwinner-rtc.c +++ b/hw/rtc/allwinner-rtc.c @@ -23,7 +23,7 @@ #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/rtc/allwinner-rtc.h" #include "system/rtc.h" #include "trace.h" diff --git a/hw/rtc/goldfish_rtc.c b/hw/rtc/goldfish_rtc.c index 67f9eacb22a..79d2a04c721 100644 --- a/hw/rtc/goldfish_rtc.c +++ b/hw/rtc/goldfish_rtc.c @@ -23,7 +23,7 @@ #include "hw/rtc/goldfish_rtc.h" #include "migration/vmstate.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/bitops.h" #include "qemu/timer.h" diff --git a/hw/rtc/m48t59-isa.c b/hw/rtc/m48t59-isa.c index 9e2f6563a0a..ea0f307aa06 100644 --- a/hw/rtc/m48t59-isa.c +++ b/hw/rtc/m48t59-isa.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/rtc/m48t59.h" #include "m48t59-internal.h" #include "qapi/error.h" diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c index 0be17b3e798..be8efb8c0ad 100644 --- a/hw/rtc/m48t59.c +++ b/hw/rtc/m48t59.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/rtc/m48t59.h" #include "qemu/timer.h" #include "system/runstate.h" diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index 4c4c1c84219..56f8c79479e 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -29,7 +29,7 @@ #include "hw/acpi/acpi_aml_interface.h" #include "hw/intc/kvm_irqcount.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/timer.h" #include "system/system.h" diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c index 2ec8ac8add6..847349b407a 100644 --- a/hw/rtc/pl031.c +++ b/hw/rtc/pl031.c @@ -15,7 +15,7 @@ #include "hw/rtc/pl031.h" #include "migration/vmstate.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/timer.h" #include "system/system.h" diff --git a/hw/rtc/rs5c372.c b/hw/rtc/rs5c372.c index bb924534a73..58f12b836d3 100644 --- a/hw/rtc/rs5c372.c +++ b/hw/rtc/rs5c372.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "hw/i2c/i2c.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/resettable.h" #include "migration/vmstate.h" #include "qemu/bcd.h" diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c index 3fe9a4a518c..e1fa3d56618 100644 --- a/hw/rx/rx62n.c +++ b/hw/rx/rx62n.c @@ -27,7 +27,7 @@ #include "hw/rx/rx62n.h" #include "hw/core/loader.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/system.h" #include "qobject/qlist.h" #include "qom/object.h" diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c index 3f0d384fd80..51c6828ff17 100644 --- a/hw/s390x/3270-ccw.c +++ b/hw/s390x/3270-ccw.c @@ -15,7 +15,7 @@ #include "qemu/module.h" #include "hw/s390x/css.h" #include "hw/s390x/css-bridge.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/3270-ccw.h" =20 /* Handle READ ccw commands from guest */ diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c index 8be1813b9e7..25c42732795 100644 --- a/hw/s390x/ccw-device.c +++ b/hw/s390x/ccw-device.c @@ -11,7 +11,7 @@ =20 #include "qemu/osdep.h" #include "ccw-device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "ipl.h" #include "qapi/visitor.h" diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c index 9182ddb628d..efe88bc9674 100644 --- a/hw/s390x/cpu-topology.c +++ b/hw/s390x/cpu-topology.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "target/s390x/cpu.h" #include "hw/s390x/s390-virtio-ccw.h" diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c index f3b6ef56300..887794beef7 100644 --- a/hw/s390x/css-bridge.c +++ b/hw/s390x/css-bridge.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/hotplug.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/bitops.h" #include "qemu/module.h" diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 53444f68288..d2c0af6a9bf 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -16,7 +16,7 @@ #include "qemu/error-report.h" #include "system/address-spaces.h" #include "hw/s390x/ioinst.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/css.h" #include "trace.h" #include "hw/s390x/s390_flic.h" diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index e0a04ab1a22..b119a87a864 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -20,7 +20,7 @@ #include "system/tcg.h" #include "elf.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "hw/s390x/virtio-ccw.h" #include "hw/s390x/vfio-ccw.h" diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 3eea2f0c9d9..ff415b6312d 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -22,7 +22,7 @@ #include "hw/s390x/s390-virtio-ccw.h" #include "hw/core/boards.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/msi.h" #include "qemu/error-report.h" diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 8eeecfd58fc..d974d97b5e7 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -13,7 +13,7 @@ #include "qemu/units.h" #include "exec/target_page.h" #include "hw/s390x/s390-virtio-ccw.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/storage-keys.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index aa185372914..f149af16ac1 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -14,7 +14,7 @@ #include "exec/target_page.h" #include "migration/qemu-file.h" #include "migration/register.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/storage-attributes.h" #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index c5e0691a26d..8314655ec2c 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -36,7 +36,7 @@ #include "migration/register.h" #include "target/s390x/cpu_models.h" #include "hw/core/nmi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/tod.h" #include "system/system.h" #include "system/cpus.h" diff --git a/hw/s390x/vhost-scsi-ccw.c b/hw/s390x/vhost-scsi-ccw.c index 8341b23a95c..1e68459eb0e 100644 --- a/hw/s390x/vhost-scsi-ccw.c +++ b/hw/s390x/vhost-scsi-ccw.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/vhost-user-fs-ccw.c b/hw/s390x/vhost-user-fs-ccw.c index cc1b8227fc0..35a77e4cb71 100644 --- a/hw/s390x/vhost-user-fs-ccw.c +++ b/hw/s390x/vhost-user-fs-ccw.c @@ -8,7 +8,7 @@ * directory. */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "hw/virtio/vhost-user-fs.h" #include "virtio-ccw.h" diff --git a/hw/s390x/vhost-vsock-ccw.c b/hw/s390x/vhost-vsock-ccw.c index 552e9e86a4b..efdfdeec84c 100644 --- a/hw/s390x/vhost-vsock-ccw.c +++ b/hw/s390x/vhost-vsock-ccw.c @@ -7,7 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-9p.c b/hw/s390x/virtio-ccw-9p.c index 72bf6ec80c8..d8612f7cd13 100644 --- a/hw/s390x/virtio-ccw-9p.c +++ b/hw/s390x/virtio-ccw-9p.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-balloon.c b/hw/s390x/virtio-ccw-balloon.c index 399b40f366e..4f67310b693 100644 --- a/hw/s390x/virtio-ccw-balloon.c +++ b/hw/s390x/virtio-ccw-balloon.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-blk.c b/hw/s390x/virtio-ccw-blk.c index 7d8c4a75ced..939dcaeed38 100644 --- a/hw/s390x/virtio-ccw-blk.c +++ b/hw/s390x/virtio-ccw-blk.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-crypto.c b/hw/s390x/virtio-ccw-crypto.c index 75e714603b1..2c4ee2ca394 100644 --- a/hw/s390x/virtio-ccw-crypto.c +++ b/hw/s390x/virtio-ccw-crypto.c @@ -9,7 +9,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-gpu.c b/hw/s390x/virtio-ccw-gpu.c index edb6a47d376..4120c6bcb9f 100644 --- a/hw/s390x/virtio-ccw-gpu.c +++ b/hw/s390x/virtio-ccw-gpu.c @@ -9,7 +9,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-input.c b/hw/s390x/virtio-ccw-input.c index 2250d8cf981..a9ec60428ca 100644 --- a/hw/s390x/virtio-ccw-input.c +++ b/hw/s390x/virtio-ccw-input.c @@ -9,7 +9,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-mem.c b/hw/s390x/virtio-ccw-mem.c index daa485d189f..dea30aacfb3 100644 --- a/hw/s390x/virtio-ccw-mem.c +++ b/hw/s390x/virtio-ccw-mem.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" #include "virtio-ccw-mem.h" diff --git a/hw/s390x/virtio-ccw-net.c b/hw/s390x/virtio-ccw-net.c index a7d4afbeb9e..30e7055ab2b 100644 --- a/hw/s390x/virtio-ccw-net.c +++ b/hw/s390x/virtio-ccw-net.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-rng.c b/hw/s390x/virtio-ccw-rng.c index 3263287d45a..0647621e33d 100644 --- a/hw/s390x/virtio-ccw-rng.c +++ b/hw/s390x/virtio-ccw-rng.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-scsi.c b/hw/s390x/virtio-ccw-scsi.c index 06b4c6c4a5a..c181a2b7692 100644 --- a/hw/s390x/virtio-ccw-scsi.c +++ b/hw/s390x/virtio-ccw-scsi.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-serial.c b/hw/s390x/virtio-ccw-serial.c index 0dac590c080..7ff07a08412 100644 --- a/hw/s390x/virtio-ccw-serial.c +++ b/hw/s390x/virtio-ccw-serial.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-serial.h" #include "virtio-ccw.h" =20 diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 844643d916f..f62e420a91e 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/dma.h" #include "system/block-backend.h" #include "system/rtc.h" diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 4ada35b7ec8..e4a7b2fee4a 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/dma.h" #include "hw/pci/msi.h" #include "qemu/iov.h" diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index b9b115deedd..f310ddafb96 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -4,7 +4,7 @@ #include "qemu/module.h" #include "qemu/option.h" #include "qemu/hw-version.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/scsi/scsi.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index b4782c6248d..9c78c9e18e2 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -36,7 +36,7 @@ #include "system/block-backend.h" #include "system/blockdev.h" #include "hw/block/block.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "system/dma.h" #include "system/system.h" diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 9e380a2109e..2ac4fd66c37 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -18,7 +18,7 @@ #include "qemu/module.h" #include "hw/scsi/scsi.h" #include "migration/qemu-file-types.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/scsi/emulation.h" #include "system/block-backend.h" diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index a6591319db7..b4c8f94d22a 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -40,7 +40,7 @@ #include "srp.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "viosrp.h" #include "trace.h" =20 diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index b356bd9762e..ede4021648a 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -27,7 +27,7 @@ #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/virtio-bus.h" #include "hw/core/fw-path-provider.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/cutils.h" #include "system/system.h" =20 diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 2c79522b09a..89f06066b70 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -20,7 +20,7 @@ #include "qemu/error-report.h" #include "hw/core/fw-path-provider.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-backend.h" diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 93e87c459c7..774968d8c70 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -24,7 +24,7 @@ #include "qemu/module.h" #include "system/block-backend.h" #include "system/dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" #include "hw/virtio/iothread-vq-mapping.h" diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 7c98b1b8ea6..b3cdc255b46 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -33,7 +33,7 @@ #include "migration/vmstate.h" #include "scsi/constants.h" #include "hw/pci/msi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "vmw_pvscsi.h" #include "trace.h" #include "qom/object.h" diff --git a/hw/sd/allwinner-sdhost.c b/hw/sd/allwinner-sdhost.c index 4c039b9520e..87bb7df9035 100644 --- a/hw/sd/allwinner-sdhost.c +++ b/hw/sd/allwinner-sdhost.c @@ -24,7 +24,7 @@ #include "qapi/error.h" #include "system/blockdev.h" #include "system/dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/irq.h" #include "hw/sd/allwinner-sdhost.h" #include "migration/vmstate.h" diff --git a/hw/sd/aspeed_sdhci.c b/hw/sd/aspeed_sdhci.c index c2c85eaaf17..77bb753b9d1 100644 --- a/hw/sd/aspeed_sdhci.c +++ b/hw/sd/aspeed_sdhci.c @@ -13,7 +13,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" =20 #define ASPEED_SDHCI_INFO 0x00 diff --git a/hw/sd/sd.c b/hw/sd/sd.c index ff45c8e70ca..3df331d5611 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -42,7 +42,7 @@ #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/bitmap.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/error-report.h" #include "qemu/timer.h" diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c index 0e38bed49a9..27001e5e1ec 100644 --- a/hw/sd/sdhci-pci.c +++ b/hw/sd/sdhci-pci.c @@ -19,7 +19,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" =20 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 39185f0a987..9146e0cde06 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -29,7 +29,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/dma.h" #include "qemu/timer.h" #include "qemu/bitops.h" diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 3aacbd03871..c6e350af2dd 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -19,7 +19,7 @@ #include "system/blockdev.h" #include "hw/ssi/ssi.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sd/sd.h" #include "qapi/error.h" #include "qemu/crc-ccitt.h" diff --git a/hw/sensor/isl_pmbus_vr.c b/hw/sensor/isl_pmbus_vr.c index e8d29b08ff3..0fad04def77 100644 --- a/hw/sensor/isl_pmbus_vr.c +++ b/hw/sensor/isl_pmbus_vr.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "hw/sensor/isl_pmbus_vr.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/visitor.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 9e8c2fa8d12..35db5cbbcd1 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -35,7 +35,7 @@ #include "system/system.h" #include "hw/core/boards.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "net/net.h" #include "sh7750_regs.h" #include "hw/ide/mmio.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 6cb42e34412..aff45320bc5 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -30,7 +30,7 @@ #include "hw/sh4/sh.h" #include "system/system.h" #include "target/sh4/cpu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "sh7750_regs.h" #include "sh7750_regnames.h" diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 50f1cf91706..ec9a386b48d 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -33,7 +33,7 @@ #include "hw/core/irq.h" #include "qemu/timer.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/system.h" #include "system/qtest.h" #include "system/reset.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index fa524513036..2e3952c917b 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -43,7 +43,7 @@ #include "hw/core/boards.h" #include "hw/scsi/esp.h" #include "hw/nvram/sun_nvram.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/nvram/chrp_nvram.h" #include "hw/nvram/fw_cfg.h" #include "hw/char/escc.h" diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c index 9ce2e3b7fc8..10c4786dad6 100644 --- a/hw/sparc/sun4m_iommu.c +++ b/hw/sparc/sun4m_iommu.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index c0fb421d2ba..14b47c037ba 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -33,7 +33,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci-host/sabre.h" #include "hw/char/serial-isa.h" #include "hw/char/serial-mm.h" diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 9819904a4ad..6bef856c620 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -34,7 +34,7 @@ #include "trace.h" =20 #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ssi/aspeed_smc.h" =20 /* CE Type Setting Register */ diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c index 63f4cce5129..a7dc0c2f032 100644 --- a/hw/ssi/ibex_spi_host.c +++ b/hw/ssi/ibex_spi_host.c @@ -29,7 +29,7 @@ #include "hw/registerfields.h" #include "hw/ssi/ibex_spi_host.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/ssi/npcm7xx_fiu.c b/hw/ssi/npcm7xx_fiu.c index bc5e4e20ccd..02707de350f 100644 --- a/hw/ssi/npcm7xx_fiu.c +++ b/hw/ssi/npcm7xx_fiu.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" =20 #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ssi/npcm7xx_fiu.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/ssi/pnv_spi.c b/hw/ssi/pnv_spi.c index e59386712b4..1cf3a4416de 100644 --- a/hw/ssi/pnv_spi.c +++ b/hw/ssi/pnv_spi.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ssi/pnv_spi.h" #include "hw/ssi/pnv_spi_regs.h" diff --git a/hw/ssi/sifive_spi.c b/hw/ssi/sifive_spi.c index c66fae80a9c..577cd5d2d8b 100644 --- a/hw/ssi/sifive_spi.c +++ b/hw/ssi/sifive_spi.c @@ -21,7 +21,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/ssi/ssi.h" #include "qemu/fifo8.h" diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c index d0de640fe64..3a4fade2d5b 100644 --- a/hw/ssi/ssi.c +++ b/hw/ssi/ssi.c @@ -13,7 +13,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ssi/ssi.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 9e8656b5560..6dcdd63916a 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -32,7 +32,7 @@ #include "qemu/fifo8.h" =20 #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/ssi/ssi.h" #include "qom/object.h" diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index 5fa9bf965ff..e3c6035c169 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/bitops.h" diff --git a/hw/ssi/xlnx-versal-ospi.c b/hw/ssi/xlnx-versal-ospi.c index 88fafb5a2ed..93cdc9d3999 100644 --- a/hw/ssi/xlnx-versal-ospi.c +++ b/hw/ssi/xlnx-versal-ospi.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "hw/core/irq.h" diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index a0b73fb7311..a2363a89a5f 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/a9gtimer.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index 6c0d3b556a2..d52669787ee 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -17,7 +17,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/timer/allwinner-a10-pit.h" #include "migration/vmstate.h" diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index adec87cc8d2..869db913d40 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -23,7 +23,7 @@ #include "hw/hw.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/arm_mptimer.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 8d8b250698c..c38e56f5b89 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -13,7 +13,7 @@ #include "qemu/timer.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "qemu/log.h" #include "qom/object.h" diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index b08a737bc97..20adb7decbe 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -19,7 +19,7 @@ #include "qemu/timer.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" =20 #define TIMER_NR_REGS 4 diff --git a/hw/timer/avr_timer16.c b/hw/timer/avr_timer16.c index 0f1fda4218f..1a65a61ed2b 100644 --- a/hw/timer/avr_timer16.c +++ b/hw/timer/avr_timer16.c @@ -35,7 +35,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/avr_timer16.h" #include "trace.h" =20 diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c index 5f4848ef618..bcb6f8e43d7 100644 --- a/hw/timer/cmsdk-apb-dualtimer.c +++ b/hw/timer/cmsdk-apb-dualtimer.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "hw/core/qdev-clock.h" #include "hw/timer/cmsdk-apb-dualtimer.h" diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 82d0d9d7622..dbce6f736fa 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -30,7 +30,7 @@ #include "qemu/timer.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" =20 #include "trace.h" diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 1387c417ae1..82006df0e34 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -29,7 +29,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/hpet.h" #include "hw/sysbus.h" #include "hw/rtc/mc146818rtc.h" diff --git a/hw/timer/ibex_timer.c b/hw/timer/ibex_timer.c index d2c4f86e038..ee186521893 100644 --- a/hw/timer/ibex_timer.c +++ b/hw/timer/ibex_timer.c @@ -30,7 +30,7 @@ #include "qemu/timer.h" #include "hw/timer/ibex_timer.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "target/riscv/cpu.h" #include "migration/vmstate.h" =20 diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c index 946e87c99a6..bd3f3e845fd 100644 --- a/hw/timer/mss-timer.c +++ b/hw/timer/mss-timer.c @@ -27,7 +27,7 @@ #include "qemu/module.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/mss-timer.h" #include "migration/vmstate.h" =20 diff --git a/hw/timer/npcm7xx_timer.c b/hw/timer/npcm7xx_timer.c index 0e62add74d3..16b62d3374b 100644 --- a/hw/timer/npcm7xx_timer.c +++ b/hw/timer/npcm7xx_timer.c @@ -18,7 +18,7 @@ =20 #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/npcm7xx_timer.h" #include "migration/vmstate.h" #include "qemu/bitops.h" diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c index 0688f49eefb..b0443b94827 100644 --- a/hw/timer/nrf51_timer.c +++ b/hw/timer/nrf51_timer.c @@ -17,7 +17,7 @@ #include "hw/arm/nrf51.h" #include "hw/core/irq.h" #include "hw/timer/nrf51_timer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" =20 diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index d18d98b2337..b875c050525 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/timer.h" #include "system/runstate.h" #include "hw/sysbus.h" diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c index c62dad690ff..35962e66c32 100644 --- a/hw/timer/renesas_cmt.c +++ b/hw/timer/renesas_cmt.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "hw/core/irq.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/renesas_cmt.h" #include "migration/vmstate.h" =20 diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c index 1fc539e9497..2e7d7d4543a 100644 --- a/hw/timer/renesas_tmr.c +++ b/hw/timer/renesas_tmr.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "hw/core/irq.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/renesas_tmr.h" #include "migration/vmstate.h" =20 diff --git a/hw/timer/sifive_pwm.c b/hw/timer/sifive_pwm.c index f1882ae6bc1..8fda5445e74 100644 --- a/hw/timer/sifive_pwm.c +++ b/hw/timer/sifive_pwm.c @@ -28,7 +28,7 @@ #include "trace.h" #include "hw/core/irq.h" #include "hw/timer/sifive_pwm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index f66b3aaa433..07359a6fe70 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -26,7 +26,7 @@ #include "qemu/timer.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c index 1de882f3eb3..50d1de58055 100644 --- a/hw/timer/sse-timer.c +++ b/hw/timer/sse-timer.c @@ -45,7 +45,7 @@ #include "hw/registerfields.h" #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 REG32(CNTPCT_LO, 0x0) diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index 979b6ad5bae..0442ac64adc 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/stm32f2xx_timer.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index fbc10015916..57a2c7101d1 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -30,7 +30,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index bc7a78f898c..8723536f931 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -19,7 +19,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "system/address-spaces.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/pci_ids.h" #include "hw/acpi/tpm.h" #include "migration/vmstate.h" diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c index ea608ba4c80..19075d1f012 100644 --- a/hw/tpm/tpm_spapr.c +++ b/hw/tpm/tpm_spapr.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" =20 #include "system/tpm_backend.h" diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c index 1615be29339..f594b15b8ab 100644 --- a/hw/tpm/tpm_tis_common.c +++ b/hw/tpm/tpm_tis_common.c @@ -32,7 +32,7 @@ =20 #include "hw/acpi/tpm.h" #include "hw/pci/pci_ids.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/tpm_backend.h" #include "system/tpm_util.h" diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c index dce83057a94..61e95434f5b 100644 --- a/hw/tpm/tpm_tis_isa.c +++ b/hw/tpm/tpm_tis_isa.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/acpi/tpm.h" #include "tpm_prop.h" diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c index 2ffa85852ac..07c30401301 100644 --- a/hw/tpm/tpm_tis_sysbus.c +++ b/hw/tpm/tpm_tis_sysbus.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/acpi/tpm.h" #include "tpm_prop.h" diff --git a/hw/tricore/triboard.c b/hw/tricore/triboard.c index db6f2b765ac..23f11cf0a16 100644 --- a/hw/tricore/triboard.c +++ b/hw/tricore/triboard.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "net/net.h" #include "hw/core/loader.h" #include "elf.h" diff --git a/hw/tricore/tricore_testdevice.c b/hw/tricore/tricore_testdevic= e.c index e8daf952982..d3ffc5fe9f3 100644 --- a/hw/tricore/tricore_testdevice.c +++ b/hw/tricore/tricore_testdevice.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/tricore/tricore_testdevice.h" =20 static void tricore_testdevice_write(void *opaque, hwaddr offset, diff --git a/hw/uefi/var-service-sysbus.c b/hw/uefi/var-service-sysbus.c index a5aa218e260..3bf93356506 100644 --- a/hw/uefi/var-service-sysbus.c +++ b/hw/uefi/var-service-sysbus.c @@ -6,7 +6,7 @@ #include "qemu/osdep.h" #include "migration/vmstate.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" =20 #include "hw/uefi/hardware-info.h" diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 887a4a2e487..9084326d11d 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c index acd4ea30d98..c3baedac2c2 100644 --- a/hw/usb/canokey.c +++ b/hw/usb/canokey.c @@ -13,7 +13,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "hw/usb/usb.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "desc.h" #include "canokey.h" diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index c21cefd82d2..985f21997aa 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -34,7 +34,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "ccid.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qom/object.h" =20 diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index c8aada0988d..306dd7d9146 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -13,7 +13,7 @@ #include "qemu/units.h" #include #include "chardev/char-fe.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/error-report.h" diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index 988824ea750..dfda2dccc04 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -31,7 +31,7 @@ =20 #include "qemu/osdep.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 296e9d0d856..ae19d60203f 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -33,7 +33,7 @@ #include "qemu/timer.h" #include "hw/input/hid.h" #include "hw/usb/hid.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" =20 struct USBHIDState { diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index f418da14094..b45d571fa83 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 04e8eedbf61..1d8cfd32dc6 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -22,7 +22,7 @@ #include "qemu/module.h" #include "qemu/filemonitor.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 34cd906d6cc..568a6ff24c6 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 17bdff9e820..286c7711f64 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -13,7 +13,7 @@ #include "qemu/cutils.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index a1081e545aa..964c142d106 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -40,7 +40,7 @@ #include "qemu/cutils.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index bbd97406f00..040cf150518 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -16,7 +16,7 @@ #include "hw/usb/usb.h" #include "hw/usb/msd.h" #include "desc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/scsi/scsi.h" #include "migration/vmstate.h" #include "qemu/cutils.h" diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 75f01c74038..8576dfec96f 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -21,7 +21,7 @@ #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" #include "qom/object.h" diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c index 83864505bb8..cd3b61158d1 100644 --- a/hw/usb/hcd-dwc2.c +++ b/hw/usb/hcd-dwc2.c @@ -41,7 +41,7 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #define USB_HZ_FS 12000000 #define USB_HZ_HS 96000000 diff --git a/hw/usb/hcd-dwc3.c b/hw/usb/hcd-dwc3.c index 98a342b8b82..74dff39fda1 100644 --- a/hw/usb/hcd-dwc3.c +++ b/hw/usb/hcd-dwc3.c @@ -33,7 +33,7 @@ #include "qemu/bitops.h" #include "qom/object.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/hcd-dwc3.h" #include "qapi/error.h" =20 diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 38ad3406b32..9febcc10314 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -16,7 +16,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/hcd-ehci.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index 0449f5fa6d6..b31032bbf39 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -16,7 +16,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/hcd-ehci.h" #include "migration/vmstate.h" =20 diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index 25c400698ee..bdbbaaa87a3 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -26,7 +26,7 @@ #include "hw/pci/pci_device.h" #include "hw/sysbus.h" #include "hw/core/qdev-dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" #include "qom/object.h" diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c index 8224fb88628..350b0118997 100644 --- a/hw/usb/hcd-ohci-sysbus.c +++ b/hw/usb/hcd-ohci-sysbus.c @@ -27,7 +27,7 @@ #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/core/qdev-dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" =20 diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 588cecef14d..c771aafdd06 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -34,7 +34,7 @@ #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/core/qdev-dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" =20 diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index c243a4f42cc..b2224c7f766 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -32,7 +32,7 @@ #include "migration/vmstate.h" #include "hw/pci/pci.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/timer.h" #include "qemu/iov.h" diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c index 5fc853eb330..46839911f3f 100644 --- a/hw/usb/hcd-xhci-nec.c +++ b/hw/usb/hcd-xhci-nec.c @@ -23,7 +23,7 @@ #include "hw/usb/usb.h" #include "qemu/module.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #include "hcd-xhci-pci.h" =20 diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c index b93c80b09d8..aa570506fc1 100644 --- a/hw/usb/hcd-xhci-pci.c +++ b/hw/usb/hcd-xhci-pci.c @@ -24,7 +24,7 @@ */ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" diff --git a/hw/usb/hcd-xhci-sysbus.c b/hw/usb/hcd-xhci-sysbus.c index 862673054a0..19664c5985e 100644 --- a/hw/usb/hcd-xhci-sysbus.c +++ b/hw/usb/hcd-xhci-sysbus.c @@ -8,7 +8,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" #include "qapi/error.h" diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 292c378bfc9..2cdab3ba0e4 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -25,7 +25,7 @@ #include "qemu/module.h" #include "qemu/queue.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "qapi/error.h" =20 diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 38893b5e680..b9f3ad3f66d 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -55,7 +55,7 @@ #include "system/system.h" #include "trace.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" =20 /* -----------------------------------------------------------------------= - */ diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 1a73db68f26..6fd04b7b421 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -41,7 +41,7 @@ #include #include =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/usb/usb.h" #include "migration/qemu-file-types.h" diff --git a/hw/usb/u2f-emulated.c b/hw/usb/u2f-emulated.c index 783e7f1af0b..196d05a83a5 100644 --- a/hw/usb/u2f-emulated.c +++ b/hw/usb/u2f-emulated.c @@ -29,7 +29,7 @@ #include "qemu/main-loop.h" #include "qapi/error.h" #include "hw/usb/usb.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #include =20 diff --git a/hw/usb/u2f-passthru.c b/hw/usb/u2f-passthru.c index b3206fb7fe4..59b5f9829d4 100644 --- a/hw/usb/u2f-passthru.c +++ b/hw/usb/u2f-passthru.c @@ -28,7 +28,7 @@ #include "qemu/main-loop.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" =20 diff --git a/hw/usb/xlnx-usb-subsystem.c b/hw/usb/xlnx-usb-subsystem.c index 98967ef49f1..7193dd4cd2c 100644 --- a/hw/usb/xlnx-usb-subsystem.c +++ b/hw/usb/xlnx-usb-subsystem.c @@ -28,7 +28,7 @@ #include "qemu/bitops.h" #include "qom/object.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/xlnx-usb-subsystem.h" =20 static void versal_usb2_realize(DeviceState *dev, Error **errp) diff --git a/hw/vfio-user/pci.c b/hw/vfio-user/pci.c index 353d07e7819..64b8b3cb8cf 100644 --- a/hw/vfio-user/pci.c +++ b/hw/vfio-user/pci.c @@ -11,7 +11,7 @@ #include "qapi-visit-sockets.h" #include "qemu/error-report.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/vfio/pci.h" #include "hw/vfio-user/device.h" #include "hw/vfio-user/proxy.h" diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 3368ac89150..e58a0169af9 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -28,7 +28,7 @@ #include "qemu/config-file.h" #include "kvm/kvm_s390x.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/ap-bridge.h" #include "system/address-spaces.h" #include "qom/object.h" diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 4d9588e7aa1..2251facb356 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -25,7 +25,7 @@ #include "system/iommufd.h" #include "hw/s390x/s390-ccw.h" #include "hw/s390x/vfio-ccw.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/ccw-device.h" #include "system/address-spaces.h" #include "qemu/error-report.h" diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index b5da6afbf5b..7b907b9360d 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -23,7 +23,7 @@ #include "qapi/visitor.h" #include #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "pci.h" #include "pci-quirks.h" #include "trace.h" diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index b46b1305a7b..6b71605dd97 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -27,7 +27,7 @@ #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/pci/pci_bridge.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/vfio/vfio-cpr.h" #include "migration/vmstate.h" diff --git a/hw/virtio/vdpa-dev-pci.c b/hw/virtio/vdpa-dev-pci.c index 30681121465..c047b0400db 100644 --- a/hw/virtio/vdpa-dev-pci.c +++ b/hw/virtio/vdpa-dev-pci.c @@ -19,7 +19,7 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/vdpa-dev.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/virtio/vdpa-dev.c b/hw/virtio/vdpa-dev.c index 57739385a96..3a6de7ebb43 100644 --- a/hw/virtio/vdpa-dev.c +++ b/hw/virtio/vdpa-dev.c @@ -20,7 +20,7 @@ #include "qemu/error-report.h" #include "qemu/cutils.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/vhost.h" #include "hw/virtio/virtio.h" diff --git a/hw/virtio/vhost-scsi-pci.c b/hw/virtio/vhost-scsi-pci.c index 7399acef8e2..a78e13e0381 100644 --- a/hw/virtio/vhost-scsi-pci.c +++ b/hw/virtio/vhost-scsi-pci.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" =20 #include "standard-headers/linux/virtio_pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-scsi.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/virtio/vhost-user-base.c b/hw/virtio/vhost-user-base.c index ff67a020b47..01ab9ca56b1 100644 --- a/hw/virtio/vhost-user-base.c +++ b/hw/virtio/vhost-user-base.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/vhost-user-base.h" #include "qemu/error-report.h" diff --git a/hw/virtio/vhost-user-blk-pci.c b/hw/virtio/vhost-user-blk-pci.c index 904369f5a3d..20d100f665d 100644 --- a/hw/virtio/vhost-user-blk-pci.c +++ b/hw/virtio/vhost-user-blk-pci.c @@ -22,7 +22,7 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/vhost-user-blk.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/virtio/vhost-user-fs-pci.c b/hw/virtio/vhost-user-fs-pci.c index 1490c118bca..92ae2fc8a67 100644 --- a/hw/virtio/vhost-user-fs-pci.c +++ b/hw/virtio/vhost-user-fs-pci.c @@ -12,7 +12,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-fs.h" #include "hw/virtio/virtio-pci.h" #include "qom/object.h" diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c index e77c69eb12e..0acd9580b13 100644 --- a/hw/virtio/vhost-user-fs.c +++ b/hw/virtio/vhost-user-fs.c @@ -15,7 +15,7 @@ #include #include "standard-headers/linux/virtio_fs.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" diff --git a/hw/virtio/vhost-user-gpio-pci.c b/hw/virtio/vhost-user-gpio-pc= i.c index 9b165b54f8f..9bd59e7ae7e 100644 --- a/hw/virtio/vhost-user-gpio-pci.c +++ b/hw/virtio/vhost-user-gpio-pci.c @@ -7,7 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-gpio.h" #include "hw/virtio/virtio-pci.h" =20 diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c index a7fd49b10a3..d473f870778 100644 --- a/hw/virtio/vhost-user-gpio.c +++ b/hw/virtio/vhost-user-gpio.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/vhost-user-gpio.h" #include "standard-headers/linux/virtio_ids.h" diff --git a/hw/virtio/vhost-user-i2c-pci.c b/hw/virtio/vhost-user-i2c-pci.c index 692cd66fde6..5ddae8367bb 100644 --- a/hw/virtio/vhost-user-i2c-pci.c +++ b/hw/virtio/vhost-user-i2c-pci.c @@ -7,7 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-i2c.h" #include "hw/virtio/virtio-pci.h" =20 diff --git a/hw/virtio/vhost-user-i2c.c b/hw/virtio/vhost-user-i2c.c index ae007fe97d9..152b1f67401 100644 --- a/hw/virtio/vhost-user-i2c.c +++ b/hw/virtio/vhost-user-i2c.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/vhost-user-i2c.h" #include "qemu/error-report.h" diff --git a/hw/virtio/vhost-user-rng-pci.c b/hw/virtio/vhost-user-rng-pci.c index 9f45fc6f355..cc289d0cb36 100644 --- a/hw/virtio/vhost-user-rng-pci.c +++ b/hw/virtio/vhost-user-rng-pci.c @@ -7,7 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-rng.h" #include "hw/virtio/virtio-pci.h" =20 diff --git a/hw/virtio/vhost-user-rng.c b/hw/virtio/vhost-user-rng.c index 61dadcda054..106c8f211aa 100644 --- a/hw/virtio/vhost-user-rng.c +++ b/hw/virtio/vhost-user-rng.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/vhost-user-rng.h" #include "standard-headers/linux/virtio_ids.h" diff --git a/hw/virtio/vhost-user-scmi-pci.c b/hw/virtio/vhost-user-scmi-pc= i.c index 0ab56a50bb3..9a83e1f1ba8 100644 --- a/hw/virtio/vhost-user-scmi-pci.c +++ b/hw/virtio/vhost-user-scmi-pci.c @@ -6,7 +6,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-scmi.h" #include "hw/virtio/virtio-pci.h" =20 diff --git a/hw/virtio/vhost-user-scsi-pci.c b/hw/virtio/vhost-user-scsi-pc= i.c index 367b8f27da5..174552eb71b 100644 --- a/hw/virtio/vhost-user-scsi-pci.c +++ b/hw/virtio/vhost-user-scsi-pci.c @@ -22,7 +22,7 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-scsi.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/virtio/vhost-user-snd-pci.c b/hw/virtio/vhost-user-snd-pci.c index f5015fb6c4e..90f47bf7a52 100644 --- a/hw/virtio/vhost-user-snd-pci.c +++ b/hw/virtio/vhost-user-snd-pci.c @@ -7,7 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-snd.h" #include "hw/virtio/virtio-pci.h" =20 diff --git a/hw/virtio/vhost-user-snd.c b/hw/virtio/vhost-user-snd.c index 732411c6551..7129b77d9c0 100644 --- a/hw/virtio/vhost-user-snd.c +++ b/hw/virtio/vhost-user-snd.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/vhost-user-snd.h" #include "standard-headers/linux/virtio_ids.h" diff --git a/hw/virtio/vhost-user-test-device-pci.c b/hw/virtio/vhost-user-= test-device-pci.c index b4ed0efb50f..7f6d7516903 100644 --- a/hw/virtio/vhost-user-test-device-pci.c +++ b/hw/virtio/vhost-user-test-device-pci.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-base.h" #include "hw/virtio/virtio-pci.h" =20 diff --git a/hw/virtio/vhost-user-test-device.c b/hw/virtio/vhost-user-test= -device.c index 1b98ea3e488..a2f963fdf60 100644 --- a/hw/virtio/vhost-user-test-device.c +++ b/hw/virtio/vhost-user-test-device.c @@ -14,7 +14,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/vhost-user-base.h" #include "qemu/error-report.h" diff --git a/hw/virtio/vhost-user-vsock-pci.c b/hw/virtio/vhost-user-vsock-= pci.c index adb877b6e05..bac96c96d8a 100644 --- a/hw/virtio/vhost-user-vsock-pci.c +++ b/hw/virtio/vhost-user-vsock-pci.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" =20 #include "hw/virtio/virtio-pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-vsock.h" #include "qom/object.h" =20 diff --git a/hw/virtio/vhost-user-vsock.c b/hw/virtio/vhost-user-vsock.c index 993c2873482..e20e0aee439 100644 --- a/hw/virtio/vhost-user-vsock.c +++ b/hw/virtio/vhost-user-vsock.c @@ -12,7 +12,7 @@ =20 #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/vhost-user-vsock.h" =20 diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c index c6c44d8989f..b33def900a7 100644 --- a/hw/virtio/vhost-vsock-common.c +++ b/hw/virtio/vhost-vsock-common.c @@ -13,7 +13,7 @@ #include "qapi/error.h" #include "hw/virtio/virtio-bus.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-vsock.h" #include "qemu/iov.h" diff --git a/hw/virtio/vhost-vsock-pci.c b/hw/virtio/vhost-vsock-pci.c index 0022a713d43..3a94d06f8c0 100644 --- a/hw/virtio/vhost-vsock-pci.c +++ b/hw/virtio/vhost-vsock-pci.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" =20 #include "hw/virtio/virtio-pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-vsock.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index 107d88babea..5b60065bdd0 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -17,7 +17,7 @@ #include "hw/virtio/virtio-access.h" #include "qemu/error-report.h" #include "qemu/sockets.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-vsock.h" #include "monitor/monitor.h" =20 diff --git a/hw/virtio/virtio-9p-pci.c b/hw/virtio/virtio-9p-pci.c index 594742ff656..4b501ac2a37 100644 --- a/hw/virtio/virtio-9p-pci.c +++ b/hw/virtio/virtio-9p-pci.c @@ -17,7 +17,7 @@ =20 #include "hw/virtio/virtio-pci.h" #include "hw/9pfs/virtio-9p.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "qom/object.h" =20 diff --git a/hw/virtio/virtio-balloon-pci.c b/hw/virtio/virtio-balloon-pci.c index 96e88b6b86d..0bb5931bbcc 100644 --- a/hw/virtio/virtio-balloon-pci.c +++ b/hw/virtio/virtio-balloon-pci.c @@ -15,7 +15,7 @@ #include "qemu/osdep.h" =20 #include "hw/virtio/virtio-pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-balloon.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index bcf6ab64432..38bf1e84a1d 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -20,7 +20,7 @@ #include "qemu/madvise.h" #include "hw/virtio/virtio.h" #include "hw/mem/pc-dimm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "system/balloon.h" #include "system/ramblock.h" diff --git a/hw/virtio/virtio-blk-pci.c b/hw/virtio/virtio-blk-pci.c index fd33bbd7e83..64a434c81b5 100644 --- a/hw/virtio/virtio-blk-pci.c +++ b/hw/virtio/virtio-blk-pci.c @@ -17,7 +17,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-blk.h" #include "hw/virtio/virtio-pci.h" #include "qapi/error.h" diff --git a/hw/virtio/virtio-crypto-pci.c b/hw/virtio/virtio-crypto-pci.c index 868abc03a9e..7b7dd056169 100644 --- a/hw/virtio/virtio-crypto-pci.c +++ b/hw/virtio/virtio-crypto-pci.c @@ -14,7 +14,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index 517f2089c5a..cbd1810fbc6 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -20,7 +20,7 @@ =20 #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-crypto.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "standard-headers/linux/virtio_ids.h" #include "system/cryptodev-vhost.h" =20 diff --git a/hw/virtio/virtio-input-pci.c b/hw/virtio/virtio-input-pci.c index 3be5358b4cd..cd356084606 100644 --- a/hw/virtio/virtio-input-pci.c +++ b/hw/virtio/virtio-input-pci.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" =20 #include "hw/virtio/virtio-pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-input.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c index dd4100033f1..9d32b8a7b3c 100644 --- a/hw/virtio/virtio-iommu-pci.c +++ b/hw/virtio/virtio-iommu-pci.c @@ -13,7 +13,7 @@ =20 #include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-iommu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qapi/error.h" #include "hw/core/boards.h" diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 3500f1b0820..4226a676d07 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -23,7 +23,7 @@ #include "qemu/range.h" #include "qemu/reserved-region.h" #include "exec/target_page.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "system/kvm.h" #include "system/reset.h" diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 5d1d90edc52..41de2ef5a0a 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -28,7 +28,7 @@ #include "qapi/visitor.h" #include "migration/misc.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/acpi/acpi.h" #include "trace.h" =20 diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index d54d70b4fb8..54bd0c57b5f 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "standard-headers/linux/virtio_mmio.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/virtio/virtio.h" #include "migration/qemu-file-types.h" diff --git a/hw/virtio/virtio-net-pci.c b/hw/virtio/virtio-net-pci.c index f857a84f11c..fd3e0303f5f 100644 --- a/hw/virtio/virtio-net-pci.c +++ b/hw/virtio/virtio-net-pci.c @@ -17,7 +17,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-net.h" #include "hw/virtio/virtio-pci.h" #include "qapi/error.h" diff --git a/hw/virtio/virtio-nsm-pci.c b/hw/virtio/virtio-nsm-pci.c index ec243963e1e..96e92be1b66 100644 --- a/hw/virtio/virtio-nsm-pci.c +++ b/hw/virtio/virtio-nsm-pci.c @@ -12,7 +12,7 @@ =20 #include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-nsm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 7382e7db6fa..b273eb26919 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -25,7 +25,7 @@ #include "migration/qemu-file-types.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/log.h" diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c index 3416ea1827c..854d08abf6e 100644 --- a/hw/virtio/virtio-pmem.c +++ b/hw/virtio/virtio-pmem.c @@ -17,7 +17,7 @@ #include "qemu/iov.h" #include "qemu/main-loop.h" #include "hw/virtio/virtio-pmem.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "standard-headers/linux/virtio_ids.h" #include "standard-headers/linux/virtio_pmem.h" diff --git a/hw/virtio/virtio-rng-pci.c b/hw/virtio/virtio-rng-pci.c index 39b600356ea..dcea260825f 100644 --- a/hw/virtio/virtio-rng-pci.c +++ b/hw/virtio/virtio-rng-pci.c @@ -13,7 +13,7 @@ =20 #include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-rng.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 3df5d2576ec..66690a34dc9 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -15,7 +15,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "hw/virtio/virtio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-rng.h" #include "system/rng.h" #include "system/runstate.h" diff --git a/hw/virtio/virtio-scsi-pci.c b/hw/virtio/virtio-scsi-pci.c index af877592070..fd5102819ad 100644 --- a/hw/virtio/virtio-scsi-pci.c +++ b/hw/virtio/virtio-scsi-pci.c @@ -15,7 +15,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-scsi.h" #include "qemu/module.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/virtio-serial-pci.c b/hw/virtio/virtio-serial-pci.c index 3f212ffe52f..6d33d149dfd 100644 --- a/hw/virtio/virtio-serial-pci.c +++ b/hw/virtio/virtio-serial-pci.c @@ -17,7 +17,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-serial.h" #include "qemu/module.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 257cda506a4..5b64eb4d67f 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -28,7 +28,7 @@ #include "migration/qemu-file-types.h" #include "qemu/atomic.h" #include "hw/virtio/virtio-bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "system/dma.h" #include "system/iothread.h" diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index ad513d4cbc1..2ebd0f07bd3 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -28,7 +28,7 @@ #include "hw/core/boards.h" #include "hw/core/irq.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/usb/usb.h" #include "hw/arm/boot.h" diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watch= dog.c index f1dd7d66eee..90d14e342b0 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -28,7 +28,7 @@ #include "system/watchdog.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "hw/core/qdev-clock.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" diff --git a/hw/watchdog/sbsa_gwdt.c b/hw/watchdog/sbsa_gwdt.c index ce84849df0e..7ade5c6f187 100644 --- a/hw/watchdog/sbsa_gwdt.c +++ b/hw/watchdog/sbsa_gwdt.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "system/reset.h" #include "system/watchdog.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/watchdog/sbsa_gwdt.h" #include "qemu/timer.h" #include "migration/vmstate.h" diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 30226435efc..930834bfcaf 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "system/watchdog.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/watchdog/wdt_aspeed.h" #include "migration/vmstate.h" diff --git a/hw/watchdog/wdt_imx2.c b/hw/watchdog/wdt_imx2.c index 10151a15d08..c83d4107c19 100644 --- a/hw/watchdog/wdt_imx2.c +++ b/hw/watchdog/wdt_imx2.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "system/watchdog.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" =20 #include "hw/watchdog/wdt_imx2.h" #include "trace.h" diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c index 6bd2e546f6b..e3c51030f35 100644 --- a/hw/xen/xen-bus.c +++ b/hw/xen/xen-bus.c @@ -9,7 +9,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/uuid.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen-backend.h" diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index da9a8e5213a..f9b0dd1513d 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -26,7 +26,7 @@ =20 #include "hw/sysbus.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/main-loop.h" #include "qapi/error.h" #include "hw/xen/xen-legacy-backend.h" diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 006b5b55f24..c1b92d90cf9 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -58,7 +58,7 @@ #include =20 #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/xen/xen_pt.h" #include "hw/xen/xen_igd.h" diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index a96abcd4bdd..a533f2bac3f 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -32,7 +32,7 @@ #include "system/system.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "elf.h" #include "system/memory.h" #include "exec/tswap.h" diff --git a/net/net.c b/net/net.c index 8aefdb3424f..4930b573ed3 100644 --- a/net/net.c +++ b/net/net.c @@ -27,7 +27,7 @@ #include "net/net.h" #include "clients.h" #include "hub.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "net/slirp.h" #include "net/eth.h" #include "util.h" diff --git a/system/physmem.c b/system/physmem.c index ba69be2d082..e3221ce00de 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -37,7 +37,7 @@ #include "exec/target_page.h" #include "exec/translation-block.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "system/xen.h" #include "system/kvm.h" diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index c8773d864d9..8e74e24c190 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -40,7 +40,7 @@ #include "system/block-backend.h" #include "migration/misc.h" #include "qemu/cutils.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/clock.h" #include "hw/core/boards.h" =20 diff --git a/system/vl.c b/system/vl.c index 659c6506fc7..2417f82c3ec 100644 --- a/system/vl.c +++ b/system/vl.c @@ -30,7 +30,7 @@ #include "qemu/target-info.h" #include "exec/cpu-common.h" #include "exec/page-vary.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/compat-policy.h" #include "qapi/error.h" #include "qobject/qdict.h" diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 09e89272edc..caf7980b1fc 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -34,7 +34,7 @@ #include "internals.h" #include "cpu-features.h" #include "exec/target_page.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #if !defined(CONFIG_USER_ONLY) #include "hw/core/loader.h" #include "hw/core/boards.h" diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index ae84d8e4205..bf303813701 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -31,7 +31,7 @@ #include "kvm_arm.h" #include "hvf_arm.h" #include "qapi/visitor.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "internals.h" #include "cpu-features.h" =20 diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index 6871956382f..917db5bb09a 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -23,7 +23,7 @@ #include "cpu.h" #include "qemu/module.h" #include "qapi/visitor.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/units.h" #include "internals.h" #include "cpu-features.h" diff --git a/target/avr/cpu.c b/target/avr/cpu.c index a6df71d0205..52237da3ce9 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -26,7 +26,7 @@ #include "cpu.h" #include "disas/dis-asm.h" #include "tcg/debug-assert.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "accel/tcg/cpu-ops.h" =20 static void avr_cpu_set_pc(CPUState *cs, vaddr value) diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index a5a04173ab8..8ac4f49aa3b 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -21,7 +21,7 @@ #include "internal.h" #include "exec/translation-block.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "fpu/softfloat-helpers.h" #include "tcg/tcg.h" #include "exec/gdbstub.h" diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c index 564c1288e47..eeee62b52a2 100644 --- a/target/i386/cpu-apic.c +++ b/target/i386/cpu-apic.c @@ -15,7 +15,7 @@ #include "system/kvm.h" #include "system/xen.h" #include "system/address-spaces.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/i386/apic_internal.h" #include "cpu-internal.h" =20 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 4216ca9ec1d..fe52538723b 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -34,7 +34,7 @@ #include "qemu/error-report.h" #include "qapi/qapi-visit-machine.h" #include "standard-headers/asm-x86/kvm_para.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/i386/topology.h" #include "exec/watchpoint.h" #ifndef CONFIG_USER_ONLY diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index d74c3c3766b..e01e044239b 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -14,7 +14,7 @@ #include "system/tcg.h" #include "system/kvm.h" #include "kvm/kvm_loongarch.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "exec/translation-block.h" #include "cpu.h" #include "cpu-mmu.h" diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 22231f09e60..53649ec6567 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "cpu.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "accel/tcg/cpu-ldst.h" #include "exec/gdbstub.h" #include "exec/translation-block.h" diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 894799c02c7..f74a9d5f615 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -29,7 +29,7 @@ #include "qemu/module.h" #include "system/kvm.h" #include "system/qtest.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "fpu_helper.h" #ifndef CONFIG_USER_ONLY diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index a3b14cceada..929254827d6 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -34,7 +34,7 @@ #include "qapi/error.h" #include "qobject/qnull.h" #include "qapi/visitor.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/ppc.h" #include "mmu-book3s-v3.h" #include "qemu/cutils.h" diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 73d4280d7c8..8f26d8b8b07 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-prop-internal.h" #include "migration/vmstate.h" #include "fpu/softfloat-helpers.h" diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index f05ce317da1..be99b2ab94c 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -30,7 +30,7 @@ #include "trace.h" #include "qapi/qapi-types-machine.h" #include "system/hw_accel.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/resettable.h" #include "fpu/softfloat-helpers.h" diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index c9773f15401..bfc6fb9d00d 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -24,7 +24,7 @@ #include "qemu/qemu-print.h" #include "accel/tcg/cpu-mmu-index.h" #include "exec/translation-block.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/visitor.h" #include "tcg/tcg.h" #include "fpu/softfloat.h" diff --git a/tests/unit/test-qdev-global-props.c b/tests/unit/test-qdev-glo= bal-props.c index 33062762a67..8ea362cbb90 100644 --- a/tests/unit/test-qdev-global-props.c +++ b/tests/unit/test-qdev-global-props.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" #include "qapi/error.h" #include "qapi/visitor.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764249583; cv=none; d=zohomail.com; s=zohoarc; b=HO+eLMY2F21tiNDWf3CemtQhX59OM/NPfMcQPP5nYeCZH7TddoxtS7cZpQZe6zv1BPHlRl1r85NY/kYgBFH/gEfl87oqyEoIMeQ7INB7eTwSmFvjUTs1iSGL9Bs6XT44t0p/o3P8HrBqtdAAOiY9MOUR16lpB7CWH5YaqdnxyVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764249583; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=1c/CqcdEjL/bbWaeAxqSK1h7PX2itfCl8C7yrGM9yhg=; b=dUTmBGzUEdHK+NsjGvbBTt22Nco9b3eU+YKwYAYP2fGTlIXRAFKiha/IKdnDd5PcvEtAb5XY3xb7msvZrlx9lTqq+8mY04UanDUnFg3TtsaEoiSCpnGY7IYDfJ3tYE/gxHVIqD1QKIdM1qeDP9TAjU8R3/isP2m2YB4j7g5pRTc= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764249583661238.41990277114246; Thu, 27 Nov 2025 05:19:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObso-0004zG-F1; Thu, 27 Nov 2025 08:18:02 -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 1vObr4-0002jt-Jk for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vObqs-0001I4-HV for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:09 -0500 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-491-WObiYR2-OzC0x2YAYhvmbw-1; Thu, 27 Nov 2025 08:15:56 -0500 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-b70b974b818so77247466b.1 for ; Thu, 27 Nov 2025 05:15:56 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f516a6c1sm165513366b.13.2025.11.27.05.15.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1c/CqcdEjL/bbWaeAxqSK1h7PX2itfCl8C7yrGM9yhg=; b=F179FdyD68a9X7Jdug2hOA0LodvsetS5/JoybuFxBW6FQLBThSI2wY5jVVmSNtRKHHORcI PvsN25wv9RgQBT1aEuGa+Xi7GWIHJVeQ2PWdiUojFGcT1DQ4ojoQeLd8ZSZ3Kq2TV756Aa Bl7keDW6QzfTbKLOkdLKj3ZfenVUNlI= X-MC-Unique: WObiYR2-OzC0x2YAYhvmbw-1 X-Mimecast-MFC-AGG-ID: WObiYR2-OzC0x2YAYhvmbw_1764249355 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249355; x=1764854155; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=1c/CqcdEjL/bbWaeAxqSK1h7PX2itfCl8C7yrGM9yhg=; b=Vlv+LsXXU90hX+SVgRKPl4zk/gGJCxCDgZnB/Kc7AVbXne7HXkniX7NpZgV5odR4dx ljcxzVNmmqKYN14u6BO7QjrzT/C8nkUEI/a6TwWOfL/B58XN4qwDuqZ/GMj2rYQhD6tu 3megNXtx5bB+PaTjI8Qs+y1Z3/Nsirt/BPzmjTIPuOSLFC1uQgH1FLh1KpZm4clVjlc6 pigu+L7lqgspYc7X5+56JoD3DmXIypQjc5Z89Fc58OaPVZh9YO4DIuCLjzrf84H7uLRt 5ZcIwolzW2Q2pMuqLSX8otK1IKHOBmCaslVyYhlW+/MzUIiRifI9O6rB1K4IF6J21OJM qFRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249355; x=1764854155; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=1c/CqcdEjL/bbWaeAxqSK1h7PX2itfCl8C7yrGM9yhg=; b=NU5lxmJewFN2L/SsYrw4PeayzDkGi6PzwUzpSjropUGctDzovNpUjUyZLTlRTQhaH4 Eh18hdBt7whk0Fk7et5hXfvVymoGjWen0oOvuwAZtdjDvwIh7Juqcj2UPnv9Ujho1NJ/ Hbz76qzkfjI2aM2grRjP8O2L9iIIzKZJepFOhHhhP0xSu30Gz7Cq+IpXc4GXp4VTZCxI UnfJ4+XSCjXl5EEMo9nY0H8kOBzuAi0qiNU9xmmhe0d0Adqe1cuYcswcu2pEkAnX3ted ykCs2jOirKg2uzyrEXfEIl7ca1HgVImN/l/37IjlUbqn7QovBsA83UwsSRvK3kBEiAOe 6tPA== X-Gm-Message-State: AOJu0YxKpn/ztSf6okzTr4vJxZp/eaFv6PQkJAN5wJ0VXePhx9O+mw8S dNYg6gUxdceR/ewbpdGwUTBWmITBdgrYdBrw8IhLYxN5QraBQUxoauoUDNgfKpmJ5+732K/VW2T T/QZogOfRBq/KawIaCA8ztbHyDwlFrf9xYnZkt5/WFvzLgqGu/dj3QYpH49Eb3oikPiC1JLtFbF 6JqThu3jd0FSk8GyvLUqaqzAVp0R2PrYKmGMmmtgcK X-Gm-Gg: ASbGnctLKLB5dkMROenXAfgwt20cnC9+5rk7LkKDWIpBPYogmPYz/YI5t95LmRdV9oE Jom/iBSDCkTyvATHMC74AWXs3rU30yhtiXFB4HJNWlHcKgQwISdxU6p3A+JtgoSZzIKFshN/PKS j/LNOEykjvMlCr2r8HGrPdG6zzzCRck17uzkNOMt87o2IucDFLdruCAPcAd8DCvd+6ilu28WjYu ZAgCgckAiSgWKbdPeOB1PQ84TbThPSBl6ISKDviR0k0kcRqBGoLidiMnMJ7KNUkMxES5gxGvIcI ddIgmUvze6uwAGqEBXFjMrRylJi0gVZlRycuOcAshabh2rUv9JZInXZYCV10JVSSU1seSeb/F13 T3f5iElN2yNoU53A7uMnQvETgcxQ8T0I3ZaXF9qN+Iu3xlstkpazI6+9BpYY1LQdDcc6ZnAV5Dx gpOJykP3NOhTAYJJ8= X-Received: by 2002:a17:906:a191:b0:b76:7f64:77a5 with SMTP id a640c23a62f3a-b767f64a792mr1848031066b.20.1764249353637; Thu, 27 Nov 2025 05:15:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IGLkyVDC3/19oH2lfZjaCRxqzU4Sx2od5v1yicSTM+ZoORiP1AR4uBGuuBy2BHOKqFGudannw== X-Received: by 2002:a17:906:a191:b0:b76:7f64:77a5 with SMTP id a640c23a62f3a-b767f64a792mr1848018366b.20.1764249352138; Thu, 27 Nov 2025 05:15:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 20/28] include: move hw/qdev-properties-system.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:07 +0100 Message-ID: <20251127131516.80807-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764249615899019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- include/hw/block/block.h | 2 +- include/hw/{ =3D> core}/qdev-properties-system.h | 0 include/net/net.h | 2 +- include/qemu/audio.h | 2 +- migration/options.h | 2 +- rust/hw/core/wrapper.h | 2 +- backends/spdm-socket.c | 2 +- hw/acpi/vmclock.c | 2 +- hw/acpi/vmgenid.c | 2 +- hw/arm/strongarm.c | 2 +- hw/block/fdc-isa.c | 2 +- hw/block/fdc.c | 2 +- hw/block/m25p80.c | 2 +- hw/block/pflash_cfi01.c | 2 +- hw/block/pflash_cfi02.c | 2 +- hw/block/vhost-user-blk.c | 2 +- hw/char/avr_usart.c | 2 +- hw/char/bcm2835_aux.c | 2 +- hw/char/cadence_uart.c | 2 +- hw/char/cmsdk-apb-uart.c | 2 +- hw/char/debugcon.c | 2 +- hw/char/digic-uart.c | 2 +- hw/char/diva-gsp.c | 2 +- hw/char/escc.c | 2 +- hw/char/exynos4210_uart.c | 2 +- hw/char/goldfish_tty.c | 2 +- hw/char/grlib_apbuart.c | 2 +- hw/char/ibex_uart.c | 2 +- hw/char/imx_serial.c | 2 +- hw/char/ipoctal232.c | 2 +- hw/char/max78000_uart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/nrf51_uart.c | 2 +- hw/char/parallel.c | 2 +- hw/char/pl011.c | 2 +- hw/char/renesas_sci.c | 2 +- hw/char/sclpconsole-lm.c | 2 +- hw/char/sclpconsole.c | 2 +- hw/char/serial-pci-multi.c | 2 +- hw/char/serial.c | 2 +- hw/char/sh_serial.c | 2 +- hw/char/shakti_uart.c | 2 +- hw/char/sifive_uart.c | 2 +- hw/char/spapr_vty.c | 2 +- hw/char/stm32f2xx_usart.c | 2 +- hw/char/stm32l4x5_usart.c | 2 +- hw/char/terminal3270.c | 2 +- hw/char/virtio-console.c | 2 +- hw/char/xen_console.c | 2 +- hw/char/xilinx_uartlite.c | 2 +- hw/core/qdev-properties-system.c | 2 +- hw/hyperv/vmbus.c | 2 +- hw/i386/kvm/i8254.c | 2 +- hw/intc/xilinx_intc.c | 2 +- hw/ipmi/ipmi_bmc_extern.c | 2 +- hw/ipmi/ipmi_bmc_sim.c | 2 +- hw/mem/cxl_type3.c | 2 +- hw/misc/allwinner-sid.c | 2 +- hw/misc/allwinner-sramc.c | 2 +- hw/misc/ivshmem-flat.c | 2 +- hw/misc/ivshmem-pci.c | 2 +- hw/misc/mac_via.c | 2 +- hw/misc/sifive_u_otp.c | 2 +- hw/misc/stm32l4x5_rcc.c | 2 +- hw/misc/xlnx-versal-cfu.c | 2 +- hw/net/rocker/rocker.c | 2 +- hw/net/xen_nic.c | 2 +- hw/net/xilinx_ethlite.c | 2 +- hw/nvram/eeprom_at24c.c | 2 +- hw/nvram/mac_nvram.c | 2 +- hw/nvram/spapr_nvram.c | 2 +- hw/nvram/xlnx-bbram.c | 2 +- hw/nvram/xlnx-efuse.c | 2 +- hw/pci-bridge/cxl_downstream.c | 2 +- hw/pci-bridge/cxl_root_port.c | 2 +- hw/pci-bridge/cxl_upstream.c | 2 +- hw/pci-bridge/gen_pcie_root_port.c | 2 +- hw/pci/pci.c | 2 +- hw/ppc/pnv_pnor.c | 2 +- hw/rtc/mc146818rtc.c | 2 +- hw/scsi/scsi-disk.c | 2 +- hw/scsi/scsi-generic.c | 2 +- hw/scsi/vhost-user-scsi.c | 2 +- hw/sd/sd.c | 2 +- hw/sh4/sh7750.c | 2 +- hw/ssi/ibex_spi_host.c | 2 +- hw/ssi/xilinx_spi.c | 2 +- hw/timer/xilinx_timer.c | 2 +- hw/usb/ccid-card-passthru.c | 2 +- hw/usb/dev-serial.c | 2 +- hw/usb/redirect.c | 2 +- hw/vfio/pci.c | 2 +- hw/virtio/vdpa-dev.c | 2 +- hw/virtio/vhost-user-fs.c | 2 +- hw/virtio/vhost-user-vsock.c | 2 +- hw/virtio/virtio-iommu-pci.c | 2 +- hw/xen/xen_pt.c | 2 +- target/s390x/cpu.c | 2 +- 98 files changed, 97 insertions(+), 97 deletions(-) rename include/hw/{ =3D> core}/qdev-properties-system.h (100%) diff --git a/include/hw/block/block.h b/include/hw/block/block.h index b4d914624ee..7dc19d8a453 100644 --- a/include/hw/block/block.h +++ b/include/hw/block/block.h @@ -13,7 +13,7 @@ =20 #include "exec/hwaddr.h" #include "qapi/qapi-types-block-core.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" =20 /* Configuration */ =20 diff --git a/include/hw/qdev-properties-system.h b/include/hw/core/qdev-pro= perties-system.h similarity index 100% rename from include/hw/qdev-properties-system.h rename to include/hw/core/qdev-properties-system.h diff --git a/include/net/net.h b/include/net/net.h index 72b476ee1dc..45bc86fc86b 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -4,7 +4,7 @@ #include "qemu/queue.h" #include "qapi/qapi-types-net.h" #include "net/queue.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" =20 #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X" #define MAC_ARG(x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \ diff --git a/include/qemu/audio.h b/include/qemu/audio.h index c56af895d62..a92e0b70ef0 100644 --- a/include/qemu/audio.h +++ b/include/qemu/audio.h @@ -27,7 +27,7 @@ =20 #include "qemu/queue.h" #include "qapi/qapi-types-audio.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #ifdef CONFIG_GIO #include "gio/gio.h" #endif diff --git a/migration/options.h b/migration/options.h index d6f1742e5b9..0c3043f1ffb 100644 --- a/migration/options.h +++ b/migration/options.h @@ -15,7 +15,7 @@ #define QEMU_MIGRATION_OPTIONS_H =20 #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/client-options.h" =20 /* migration properties */ diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h index 8fda78924d8..f6b34161a68 100644 --- a/rust/hw/core/wrapper.h +++ b/rust/hw/core/wrapper.h @@ -28,5 +28,5 @@ typedef enum memory_order { #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/core/irq.h" diff --git a/backends/spdm-socket.c b/backends/spdm-socket.c index 07aea375165..bc5c7afb3cd 100644 --- a/backends/spdm-socket.c +++ b/backends/spdm-socket.c @@ -14,7 +14,7 @@ #include "system/spdm-socket.h" #include "qapi/error.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/core/qdev-prop-internal.h" =20 static bool read_bytes(const int socket, uint8_t *buffer, diff --git a/hw/acpi/vmclock.c b/hw/acpi/vmclock.c index 55c9f950662..d51cab2e20a 100644 --- a/hw/acpi/vmclock.c +++ b/hw/acpi/vmclock.c @@ -18,7 +18,7 @@ #include "hw/acpi/vmclock.h" #include "hw/nvram/fw_cfg.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "system/reset.h" =20 diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index fcf9a94daf1..e87c0256964 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -18,7 +18,7 @@ #include "hw/acpi/vmgenid.h" #include "hw/nvram/fw_cfg.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "system/reset.h" =20 diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 3ee73ee4594..acc75476c34 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -30,7 +30,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "strongarm.h" diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index ebb3d2f7cd8..a10f34a20f5 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -36,7 +36,7 @@ #include "hw/core/irq.h" #include "hw/isa/isa.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/block/block.h" #include "system/block-backend.h" diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 1747f6506fd..4585640af92 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -36,7 +36,7 @@ #include "hw/core/irq.h" #include "hw/isa/isa.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/block/block.h" #include "system/block-backend.h" diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 648e6bdc008..4a758f83dc7 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -27,7 +27,7 @@ #include "hw/block/block.h" #include "hw/block/flash.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/ssi/ssi.h" #include "migration/vmstate.h" #include "qemu/bitops.h" diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index f93b812c024..d1673a1b411 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -40,7 +40,7 @@ #include "hw/block/block.h" #include "hw/block/flash.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "system/block-backend.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 6a74bcb7a1b..423516cb301 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -36,7 +36,7 @@ #include "hw/block/block.h" #include "hw/block/flash.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/bitmap.h" diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index 62295f187ca..4d81d2dc347 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -22,7 +22,7 @@ #include "qemu/cutils.h" #include "hw/core/qdev.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/virtio/virtio-blk-common.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-user-blk.h" diff --git a/hw/char/avr_usart.c b/hw/char/avr_usart.c index c3515b6f7d0..30e135a244b 100644 --- a/hw/char/avr_usart.c +++ b/hw/char/avr_usart.c @@ -24,7 +24,7 @@ #include "qemu/log.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" =20 static int avr_usart_can_receive(void *opaque) { diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c index 47e24c5bba1..d1e114f2dea 100644 --- a/hw/char/bcm2835_aux.c +++ b/hw/char/bcm2835_aux.c @@ -24,7 +24,7 @@ #include "hw/char/bcm2835_aux.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index 58c4c95fded..c24ece5fe88 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -32,7 +32,7 @@ #include "hw/char/cadence_uart.h" #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "trace.h" =20 #ifdef CADENCE_UART_ERR_DEBUG diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c index a5ec61a0044..c3645a553ec 100644 --- a/hw/char/cmsdk-apb-uart.c +++ b/hw/char/cmsdk-apb-uart.c @@ -27,7 +27,7 @@ #include "chardev/char-serial.h" #include "hw/char/cmsdk-apb-uart.h" #include "hw/core/irq.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" =20 REG32(DATA, 0) REG32(STATE, 4) diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c index 36607d0c1c7..a1b370b90be 100644 --- a/hw/char/debugcon.c +++ b/hw/char/debugcon.c @@ -30,7 +30,7 @@ #include "chardev/char-fe.h" #include "hw/isa/isa.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qom/object.h" =20 #define TYPE_ISA_DEBUGCON_DEVICE "isa-debugcon" diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c index 04dec0df8a6..8a704dfcf50 100644 --- a/hw/char/digic-uart.c +++ b/hw/char/digic-uart.c @@ -35,7 +35,7 @@ =20 #include "hw/char/digic-uart.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" =20 enum { ST_RX_RDY =3D (1 << 0), diff --git a/hw/char/diva-gsp.c b/hw/char/diva-gsp.c index 1dafc1e80c3..280d0413c6e 100644 --- a/hw/char/diva-gsp.c +++ b/hw/char/diva-gsp.c @@ -21,7 +21,7 @@ #include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" =20 #define PCI_DEVICE_ID_HP_DIVA 0x1048 diff --git a/hw/char/escc.c b/hw/char/escc.c index 496bbc56dea..a2fb682f8be 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index 387156d5e34..d1c2f249150 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -32,7 +32,7 @@ #include "hw/arm/exynos4210.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" =20 #include "trace.h" #include "qom/object.h" diff --git a/hw/char/goldfish_tty.c b/hw/char/goldfish_tty.c index 821b3218502..35bcb2a9676 100644 --- a/hw/char/goldfish_tty.c +++ b/hw/char/goldfish_tty.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "chardev/char-fe.h" diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index 9731e664c1b..7be847d0932 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/char/grlib_uart.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c index ac4a43af84e..3166f6d3094 100644 --- a/hw/char/ibex_uart.c +++ b/hw/char/ibex_uart.c @@ -30,7 +30,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/registerfields.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index 78d2c25f86f..080b7f6331c 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -22,7 +22,7 @@ #include "hw/char/imx_serial.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 19f312b9d30..b66c20f4fa8 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -12,7 +12,7 @@ #include "hw/ipack/ipack.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/module.h" diff --git a/hw/char/max78000_uart.c b/hw/char/max78000_uart.c index 59ec24a15e8..85fc6eed3e5 100644 --- a/hw/char/max78000_uart.c +++ b/hw/char/max78000_uart.c @@ -10,7 +10,7 @@ #include "hw/char/max78000_uart.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qemu/log.h" #include "qemu/module.h" #include "migration/vmstate.h" diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 391674dbcc6..51edf917c94 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -13,7 +13,7 @@ #include "qapi/error.h" #include "hw/m68k/mcf.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "chardev/char-fe.h" #include "qom/object.h" =20 diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c index 6087cabeb3c..73069232441 100644 --- a/hw/char/nrf51_uart.c +++ b/hw/char/nrf51_uart.c @@ -18,7 +18,7 @@ #include "hw/char/nrf51_uart.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "trace.h" =20 diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 6708d7658bd..07bbc9443fb 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -29,7 +29,7 @@ #include "chardev/char-parallel.h" #include "hw/acpi/acpi_aml_interface.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/char/parallel-isa.h" #include "hw/char/parallel.h" diff --git a/hw/char/pl011.c b/hw/char/pl011.c index f37ffd349f6..0b0af677988 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -25,7 +25,7 @@ #include "hw/sysbus.h" #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "chardev/char-fe.h" #include "chardev/char-serial.h" diff --git a/hw/char/renesas_sci.c b/hw/char/renesas_sci.c index 3c1cc43954b..f1c5d5ae6b3 100644 --- a/hw/char/renesas_sci.c +++ b/hw/char/renesas_sci.c @@ -26,7 +26,7 @@ #include "hw/core/irq.h" #include "hw/registerfields.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/char/renesas_sci.h" #include "migration/vmstate.h" =20 diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index ed08cf42da2..9a16896d228 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -23,7 +23,7 @@ #include "migration/vmstate.h" #include "hw/s390x/event-facility.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/s390x/ebcdic.h" #include "qom/object.h" =20 diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index ab444fe1fa4..179d12745cc 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -20,7 +20,7 @@ #include "hw/s390x/sclp.h" #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/s390x/event-facility.h" #include "chardev/char-fe.h" #include "qom/object.h" diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c index f0af12c14f9..17796b93dd7 100644 --- a/hw/char/serial-pci-multi.c +++ b/hw/char/serial-pci-multi.c @@ -33,7 +33,7 @@ #include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" =20 #define PCI_SERIAL_MAX_PORTS 4 diff --git a/hw/char/serial.c b/hw/char/serial.c index cbff68a7111..adbd1d1d4ab 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -36,7 +36,7 @@ #include "qemu/error-report.h" #include "trace.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" =20 #define UART_LCR_DLAB 0x80 /* Divisor latch access bit */ =20 diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 9cd79fce334..b3bed2bb7bf 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -30,7 +30,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/sh4/sh.h" #include "chardev/char-fe.h" #include "qapi/error.h" diff --git a/hw/char/shakti_uart.c b/hw/char/shakti_uart.c index 51e45351d95..2d1bc9cb8e2 100644 --- a/hw/char/shakti_uart.c +++ b/hw/char/shakti_uart.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/char/shakti_uart.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qemu/log.h" =20 static uint64_t shakti_uart_read(void *opaque, hwaddr addr, unsigned size) diff --git a/hw/char/sifive_uart.c b/hw/char/sifive_uart.c index 473374d3de1..af17cf9a6ce 100644 --- a/hw/char/sifive_uart.c +++ b/hw/char/sifive_uart.c @@ -24,7 +24,7 @@ #include "chardev/char-fe.h" #include "hw/core/irq.h" #include "hw/char/sifive_uart.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" =20 #define TX_INTERRUPT_TRIGGER_DELAY_NS 100 =20 diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index 17a17c47c36..1dd9fb155cb 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -7,7 +7,7 @@ #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qom/object.h" =20 #define VTERM_BUFSIZE 16 diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c index 2c19ec69cc8..2bf0161fa58 100644 --- a/hw/char/stm32f2xx_usart.c +++ b/hw/char/stm32f2xx_usart.c @@ -26,7 +26,7 @@ #include "hw/char/stm32f2xx_usart.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qemu/log.h" #include "qemu/module.h" =20 diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c index 8b208ba9b6a..664d03d6b96 100644 --- a/hw/char/stm32l4x5_usart.c +++ b/hw/char/stm32l4x5_usart.c @@ -27,7 +27,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/registerfields.h" #include "trace.h" =20 diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index 821a75c37a2..1d857bad9bc 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -16,7 +16,7 @@ #include "qemu/module.h" #include "chardev/char-fe.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/s390x/3270-ccw.h" #include "qom/object.h" =20 diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 8c2a6a9d1d3..25db0f019b8 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -16,7 +16,7 @@ #include "qemu/module.h" #include "trace.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/virtio/virtio-serial.h" #include "qapi/error.h" #include "qapi/qapi-events-char.h" diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index a0d142582ee..8ee098d9ad4 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -30,7 +30,7 @@ #include "hw/xen/xen-backend.h" #include "hw/xen/xen-bus-helper.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/xen/interface/io/console.h" #include "hw/xen/interface/io/xs_wire.h" #include "hw/xen/interface/grant_table.h" diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index 9d81cd904c6..ba7e9e339b6 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -28,7 +28,7 @@ #include "hw/char/xilinx_uartlite.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "chardev/char-fe.h" diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index d0a66358b5a..fe5464c7da1 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "qapi/qapi-types-block.h" diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 639d932b094..86b53a23ade 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/hyperv/hyperv.h" #include "hw/hyperv/vmbus.h" #include "hw/hyperv/vmbus-bridge.h" diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c index 14b78f30a83..81e742f8667 100644 --- a/hw/i386/kvm/i8254.c +++ b/hw/i386/kvm/i8254.c @@ -32,7 +32,7 @@ #include "system/runstate.h" #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "system/kvm.h" #include "target/i386/kvm/kvm_i386.h" #include "qom/object.h" diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index 465df1c3af2..f93f0d6e7ea 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -31,7 +31,7 @@ #include "qemu/module.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qom/object.h" =20 #define D(x) diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index fb90a7d7c30..fa08ed6c217 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -35,7 +35,7 @@ #include "chardev/char-fe.h" #include "hw/ipmi/ipmi.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "qom/object.h" =20 diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index b86943c3245..3d4fe1a699a 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -30,7 +30,7 @@ #include "qemu/module.h" #include "hw/core/loader.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" =20 #define IPMI_NETFN_CHASSIS 0x00 diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index 26baa1c3d6c..6eb20137a04 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -18,7 +18,7 @@ #include "hw/mem/pc-dimm.h" #include "hw/pci/pci.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-sid.c b/hw/misc/allwinner-sid.c index 17faf67e606..92a0c7918bc 100644 --- a/hw/misc/allwinner-sid.c +++ b/hw/misc/allwinner-sid.c @@ -26,7 +26,7 @@ #include "qemu/guest-random.h" #include "qapi/error.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/misc/allwinner-sid.h" #include "trace.h" =20 diff --git a/hw/misc/allwinner-sramc.c b/hw/misc/allwinner-sramc.c index bd7f59fec97..423e0a844fa 100644 --- a/hw/misc/allwinner-sramc.c +++ b/hw/misc/allwinner-sramc.c @@ -25,7 +25,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/misc/allwinner-sramc.h" #include "trace.h" =20 diff --git a/hw/misc/ivshmem-flat.c b/hw/misc/ivshmem-flat.c index 790500d34de..1248f9e81bc 100644 --- a/hw/misc/ivshmem-flat.c +++ b/hw/misc/ivshmem-flat.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "system/address-spaces.h" diff --git a/hw/misc/ivshmem-pci.c b/hw/misc/ivshmem-pci.c index fb69af52f62..b9162589a02 100644 --- a/hw/misc/ivshmem-pci.c +++ b/hw/misc/ivshmem-pci.c @@ -23,7 +23,7 @@ #include "qemu/cutils.h" #include "hw/pci/pci.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "system/kvm.h" diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index 887397ae842..0c608c3dc63 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -28,7 +28,7 @@ #include "qapi/error.h" #include "qemu/cutils.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "system/block-backend.h" #include "system/rtc.h" #include "trace.h" diff --git a/hw/misc/sifive_u_otp.c b/hw/misc/sifive_u_otp.c index 1d352680468..899bc31745c 100644 --- a/hw/misc/sifive_u_otp.c +++ b/hw/misc/sifive_u_otp.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/sysbus.h" #include "qemu/error-report.h" #include "qemu/log.h" diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c index c2b25e9a4de..cf7fa28cbe9 100644 --- a/hw/misc/stm32l4x5_rcc.c +++ b/hw/misc/stm32l4x5_rcc.c @@ -27,7 +27,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/registerfields.h" #include "trace.h" =20 diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c index 80f9612b2ff..13cd597da49 100644 --- a/hw/misc/xlnx-versal-cfu.c +++ b/hw/misc/xlnx-versal-cfu.c @@ -19,7 +19,7 @@ #include "qemu/units.h" #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/misc/xlnx-versal-cfu.h" =20 #ifndef XLNX_VERSAL_CFU_APB_ERR_DEBUG diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 935e74fd7d1..3eb7b445113 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci_device.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/pci/msix.h" #include "net/net.h" diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index 4ef1b7dd29a..f4d0b060130 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -38,7 +38,7 @@ #include "hw/xen/xen-backend.h" #include "hw/xen/xen-bus-helper.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" =20 #include "hw/xen/interface/io/netif.h" #include "hw/xen/interface/io/xs_wire.h" diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 39e64a46e26..72b14811a9d 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -34,7 +34,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/misc/unimp.h" #include "net/net.h" #include "trace.h" diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index e947cf8a3b2..8b7f2dc13f1 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -15,7 +15,7 @@ #include "hw/i2c/i2c.h" #include "hw/nvram/eeprom_at24c.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "system/block-backend.h" #include "qom/object.h" =20 diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c index b048db0777a..efadb3c943c 100644 --- a/hw/nvram/mac_nvram.c +++ b/hw/nvram/mac_nvram.c @@ -28,7 +28,7 @@ #include "hw/nvram/chrp_nvram.h" #include "hw/nvram/mac_nvram.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "system/block-backend.h" #include "migration/vmstate.h" #include "qemu/cutils.h" diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c index c9202ddfcd4..58d81f77c88 100644 --- a/hw/nvram/spapr_nvram.c +++ b/hw/nvram/spapr_nvram.c @@ -37,7 +37,7 @@ #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qom/object.h" =20 struct SpaprNvram { diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c index aad445b9018..60ede7e40fb 100644 --- a/hw/nvram/xlnx-bbram.c +++ b/hw/nvram/xlnx-bbram.c @@ -32,7 +32,7 @@ #include "system/blockdev.h" #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/nvram/xlnx-efuse.h" =20 #ifndef XLNX_BBRAM_ERR_DEBUG diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c index 7eb156f9413..facbef3fc4c 100644 --- a/hw/nvram/xlnx-efuse.c +++ b/hw/nvram/xlnx-efuse.c @@ -32,7 +32,7 @@ #include "qapi/error.h" #include "system/blockdev.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" =20 #define TBIT0_OFFSET 28 #define TBIT1_OFFSET 29 diff --git a/hw/pci-bridge/cxl_downstream.c b/hw/pci-bridge/cxl_downstream.c index 1265e40c395..f7b131e67e8 100644 --- a/hw/pci-bridge/cxl_downstream.c +++ b/hw/pci-bridge/cxl_downstream.c @@ -14,7 +14,7 @@ #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/cxl/cxl.h" #include "qapi/error.h" =20 diff --git a/hw/pci-bridge/cxl_root_port.c b/hw/pci-bridge/cxl_root_port.c index df359dee670..616d5d934cc 100644 --- a/hw/pci-bridge/cxl_root_port.c +++ b/hw/pci-bridge/cxl_root_port.c @@ -24,7 +24,7 @@ #include "hw/pci/pcie_port.h" #include "hw/pci/msi.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "hw/cxl/cxl.h" diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c index 019c311bb5b..6d708fadc25 100644 --- a/hw/pci-bridge/cxl_upstream.c +++ b/hw/pci-bridge/cxl_upstream.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_ro= ot_port.c index fa1cf5e58fd..2f7257d166a 100644 --- a/hw/pci-bridge/gen_pcie_root_port.c +++ b/hw/pci-bridge/gen_pcie_root_port.c @@ -16,7 +16,7 @@ #include "hw/pci/msix.h" #include "hw/pci/pcie_port.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "qom/object.h" =20 diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 2371a916809..5996229c813 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -31,7 +31,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/cpr.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" diff --git a/hw/ppc/pnv_pnor.c b/hw/ppc/pnv_pnor.c index 1083e42ab57..365c4d78b8a 100644 --- a/hw/ppc/pnv_pnor.c +++ b/hw/ppc/pnv_pnor.c @@ -16,7 +16,7 @@ #include "hw/core/loader.h" #include "hw/ppc/pnv_pnor.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" =20 static uint64_t pnv_pnor_read(void *opaque, hwaddr addr, unsigned size) { diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index 56f8c79479e..ccbb2797169 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -30,7 +30,7 @@ #include "hw/intc/kvm_irqcount.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qemu/timer.h" #include "system/system.h" #include "system/replay.h" diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 9c78c9e18e2..0f896c27f47 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -37,7 +37,7 @@ #include "system/blockdev.h" #include "hw/block/block.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "system/dma.h" #include "system/system.h" #include "qemu/cutils.h" diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 2ac4fd66c37..0a676a16fa4 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -19,7 +19,7 @@ #include "hw/scsi/scsi.h" #include "migration/qemu-file-types.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/scsi/emulation.h" #include "system/block-backend.h" #include "trace.h" diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 89f06066b70..3612897d4b9 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -21,7 +21,7 @@ #include "hw/core/fw-path-provider.h" #include "hw/core/qdev.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-backend.h" #include "hw/virtio/vhost-user-scsi.h" diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 3df331d5611..5aa34f1d5bd 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -43,7 +43,7 @@ #include "qapi/error.h" #include "qemu/bitmap.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qemu/error-report.h" #include "qemu/timer.h" #include "qemu/log.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index aff45320bc5..a0aa89ad318 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -31,7 +31,7 @@ #include "system/system.h" #include "target/sh4/cpu.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "sh7750_regs.h" #include "sh7750_regnames.h" #include "hw/sh4/sh_intc.h" diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c index a7dc0c2f032..50cf08de9c9 100644 --- a/hw/ssi/ibex_spi_host.c +++ b/hw/ssi/ibex_spi_host.c @@ -30,7 +30,7 @@ #include "hw/ssi/ibex_spi_host.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "trace.h" =20 diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 6dcdd63916a..cf406d08246 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -33,7 +33,7 @@ =20 #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/ssi/ssi.h" #include "qom/object.h" =20 diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index 57a2c7101d1..9c2969a2c4f 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -31,7 +31,7 @@ #include "hw/core/irq.h" #include "hw/core/ptimer.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qemu/log.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 306dd7d9146..5ab7855272a 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -14,7 +14,7 @@ #include #include "chardev/char-fe.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 286c7711f64..b238cb79375 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -14,7 +14,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 6fd04b7b421..fda5bbca676 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -42,7 +42,7 @@ #include =20 #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/usb/usb.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 6b71605dd97..a0a66b105aa 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -28,7 +28,7 @@ #include "hw/pci/msix.h" #include "hw/pci/pci_bridge.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/vfio/vfio-cpr.h" #include "migration/vmstate.h" #include "migration/cpr.h" diff --git a/hw/virtio/vdpa-dev.c b/hw/virtio/vdpa-dev.c index 3a6de7ebb43..f2377d2d501 100644 --- a/hw/virtio/vdpa-dev.c +++ b/hw/virtio/vdpa-dev.c @@ -21,7 +21,7 @@ #include "qemu/cutils.h" #include "hw/core/qdev.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/virtio/vhost.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c index 0acd9580b13..ad6fcacf066 100644 --- a/hw/virtio/vhost-user-fs.c +++ b/hw/virtio/vhost-user-fs.c @@ -16,7 +16,7 @@ #include "standard-headers/linux/virtio_fs.h" #include "qapi/error.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" #include "qemu/error-report.h" diff --git a/hw/virtio/vhost-user-vsock.c b/hw/virtio/vhost-user-vsock.c index e20e0aee439..c2cd376e732 100644 --- a/hw/virtio/vhost-user-vsock.c +++ b/hw/virtio/vhost-user-vsock.c @@ -13,7 +13,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/virtio/vhost-user-vsock.h" =20 static const int user_feature_bits[] =3D { diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c index 9d32b8a7b3c..f5f6ce7359d 100644 --- a/hw/virtio/virtio-iommu-pci.c +++ b/hw/virtio/virtio-iommu-pci.c @@ -14,7 +14,7 @@ #include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-iommu.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/pci/pci_bus.h" diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index c1b92d90cf9..0fe9c0aada8 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -59,7 +59,7 @@ =20 #include "hw/pci/pci.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/xen/xen_pt.h" #include "hw/xen/xen_igd.h" #include "hw/xen/xen.h" diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index be99b2ab94c..da536fb30ed 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -31,7 +31,7 @@ #include "qapi/qapi-types-machine.h" #include "system/hw_accel.h" #include "hw/core/qdev-properties.h" -#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-properties-system.h" #include "hw/resettable.h" #include "fpu/softfloat-helpers.h" #include "disas/capstone.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764252489; cv=none; d=zohomail.com; s=zohoarc; b=nInuBKUpPOtfVTxd4P79lkeBpXfkSLiUj+ZMdZCjbRoglSKA6XTZ3nCClSJGHxIzU7CM3HWvXepXu0ci0MpIaL4xgZFsml8ZpR30S35pxWcE97+SqBpEwUkadl9NnBdMYJhp/CueM4uP11cCtB49VD1eZEyYfi+xic7/9xHs3do= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764252489; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=XQIjFIgFEKZNL57CWppgTe5fleUieqhoACa2fnBgQjU=; b=g8QcGcclTPLaBow/RbsLLCtK/n0L//DJFUcIsFe6fuVKKA8rj10L3jcEklakiCt2PAWuuqWQOIjrK3GzKUBZ0oJ0V+dX8+EtAewp6Uk7ovg3dX2e5xRDuffjaAcPIQpHZJ3C8kQjPUag83rCnxpGaMTuT954vAXoKWJe9N1x+uw= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176425248996345.10354470372022; Thu, 27 Nov 2025 06:08:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObrl-0003B2-2b; Thu, 27 Nov 2025 08:17:00 -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 1vObr6-0002k0-OQ for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:20 -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 1vObqy-0001IE-TO for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:14 -0500 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-340-Xg0bB0dIMKa-rrVEDnWwLw-1; Thu, 27 Nov 2025 08:15:58 -0500 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-b733b21a138so90691266b.1 for ; Thu, 27 Nov 2025 05:15:58 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f5162088sm162990366b.1.2025.11.27.05.15.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XQIjFIgFEKZNL57CWppgTe5fleUieqhoACa2fnBgQjU=; b=FGMGpFTb0W08PKiRu+Ms1HcYRnBIMZIp2twOLeSjXt2MlK3Rx79tMBA1Tx6EaYGMYWG8pa aEFo1u8vtmXF9Nv7Oogy6dwjiH8V9N/LRb0ABmGWgBxvfT7lkvuT1JWFariqwasMfF5fsB gJ3NG2FBZBxzCPI7sRDb810gcYgsdas= X-MC-Unique: Xg0bB0dIMKa-rrVEDnWwLw-1 X-Mimecast-MFC-AGG-ID: Xg0bB0dIMKa-rrVEDnWwLw_1764249357 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249356; x=1764854156; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XQIjFIgFEKZNL57CWppgTe5fleUieqhoACa2fnBgQjU=; b=JGdUNMXyafoB592N8XmXZh2rxQRr6aV1qMdOXGaGPhrr+sw5Y853RMS0FeP4nK+ke2 jEyMyz9cibdPwCfQq43eAKE9dPZVq5/ccEtfkPzCz/ZjAFBYzLqB9Dq8FENfxLnBl9+a CXN7vTEkIMEEGv6kjtOjLw4jqTGbLke8iui13J8/m10uwOibSksvSe4cnytrN6dVb5lw ospdHli0Bg0rUbzaVYyCgYOIOXEJ7gZmsdW1TXyCZELPqp+7HMGOiBZmGzPBUqRzbX2i lcWWeusMEO8aV06qxakoFVvcJaOMCOaH1ksOls6BxzgPTDihsKWdcVH3H78fzBOZ4Xo8 mrbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249356; x=1764854156; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=XQIjFIgFEKZNL57CWppgTe5fleUieqhoACa2fnBgQjU=; b=u9DYL1HaqvBuiYJHz8EiQwsrwPsXa+Ic7M5k475U7jzU/yX8Zpr59qnuN3x3d6wfas OF6P8HkEEjDCjtZfk/N4AkK6uHtnugLgLLYnlSrnmToBgOPH3k/74WKgY9c9gznovu63 LOWBWt8/1jHaxmhzQ4N/NwvLTLvBRKgiExvflB00RRYFUGwbZ73/ZFEIWNPOVpDSzhcB M1j59n0g6OZsT1dUMxf91Z8Sa6Ci4s8abVFRxcinqRVNYHO2hZZeRURzJfZxib4RTGl3 hrsZR4KJbi40javjeDtuJxAdpThZsbfzcOPbwSH1RWNUOgegmSbr4gww5JElRS2tF1yk 7qEA== X-Gm-Message-State: AOJu0Yxsb3rdB/gbCea5DPY1tuz/4GFOH9ClQRAZncRXzmlo+3rCB7e5 f69db4mkL/OqnHu7W2AnNhdQgfE0E3D6ikHSPGxbyTTnVS588HkqIyzv+Ttre9DrZd0fgGhzQDx lV7iUx00T2fse08xTwV+uQUzS9byf8z0+6pz8bA/L1/xFBGdKIHAXuAQMlKrquVQjbxrpxsenpB GbkbU5yANZBU8ChNdr/9G9ns7hXayBCyamnlr2dbSe X-Gm-Gg: ASbGnctwjafZs2qWAQM7rHYHTyAGxgowGoPlZMP0qS/Vyf3wfJmghzDWBnzEe/ik8nM Spo6GvgBiVn7fNWqiBhzRELbb7BdGiyO2UmKKeNpryDQTKIP4KrJrMwYmW31KA7CWGXusTtezDc E/euEMjSTMD9o0ysnmo1PJ4JPxGrrpF57rFrldsHR8rcbD/5saZk+lY2ixDn4dVoXLYIZKOY16Q bkA07LgU8yjIJ/Ts+rxI1MwtPRvxD7DzG/rEQeoW+SOwVTsUn+2sl1ZVwiPU4/G2JCWNX/NEDYU WWrUnfkqa+0YOe3IVIRHjGNg3U/iE0COR88O2yB1sCZsiqjqoU79Xx3Zc7S1Sl4tr+a+aPkK6lc 9G0Fe3Pp3gHna/aQ4NzBEGH1+J7ud0aMRpD3JIjLr70P+qYlPil63Eoho/Iy+VA4ZV/wCl4pBFg orW7VF6V+D8bJSpgE= X-Received: by 2002:a17:907:3f1e:b0:b73:5acd:465e with SMTP id a640c23a62f3a-b767153ee39mr2632923166b.11.1764249355871; Thu, 27 Nov 2025 05:15:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IG9JUauvtIrEI2RISFncHMHMcyktLZBFUqBJ3goZ6kmqZ50K2hhpQnzuR4dYULVNpyXkRfJsA== X-Received: by 2002:a17:907:3f1e:b0:b73:5acd:465e with SMTP id a640c23a62f3a-b767153ee39mr2632906566b.11.1764249353864; Thu, 27 Nov 2025 05:15:53 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 21/28] include: move hw/registerfields.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:08 +0100 Message-ID: <20251127131516.80807-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764252492445019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- MAINTAINERS | 2 +- docs/devel/style.rst | 2 +- hw/arm/smmuv3-internal.h | 2 +- hw/intc/gic_internal.h | 2 +- hw/intc/gicv3_internal.h | 2 +- hw/sd/sdhci-internal.h | 2 +- include/block/nvme.h | 2 +- include/block/ufs.h | 2 +- include/fpu/softfloat-types.h | 2 +- include/hw/acpi/tpm.h | 2 +- include/hw/char/nrf51_uart.h | 2 +- include/hw/{ =3D> core}/registerfields.h | 0 include/hw/i2c/aspeed_i2c.h | 2 +- include/hw/misc/bcm2835_cprman_internals.h | 2 +- include/hw/misc/stm32l4x5_rcc_internals.h | 2 +- include/hw/register.h | 2 +- target/arm/cpregs.h | 2 +- target/arm/cpu-features.h | 2 +- target/arm/cpu.h | 2 +- target/arm/internals.h | 2 +- target/arm/mmuidx-internal.h | 2 +- target/hexagon/cpu.h | 2 +- target/hppa/cpu.h | 2 +- target/loongarch/cpu-csr.h | 2 +- target/loongarch/cpu.h | 2 +- target/ppc/cpu.h | 2 +- target/ppc/internal.h | 2 +- target/riscv/cpu.h | 2 +- target/riscv/internals.h | 2 +- target/riscv/vector_internals.h | 2 +- target/rx/cpu.h | 2 +- target/tricore/cpu.h | 2 +- hw/adc/npcm7xx_adc.c | 2 +- hw/arm/armsse.c | 2 +- hw/arm/raspi.c | 2 +- hw/arm/raspi4b.c | 2 +- hw/char/cmsdk-apb-uart.c | 2 +- hw/char/ibex_uart.c | 2 +- hw/char/renesas_sci.c | 2 +- hw/char/stm32l4x5_usart.c | 2 +- hw/gpio/aspeed_gpio.c | 2 +- hw/i2c/arm_sbcon_i2c.c | 2 +- hw/i2c/aspeed_i2c.c | 2 +- hw/intc/aspeed_intc.c | 2 +- hw/intc/rx_icu.c | 2 +- hw/misc/armsse-cpu-pwrctrl.c | 2 +- hw/misc/armsse-cpuid.c | 2 +- hw/misc/armsse-mhu.c | 2 +- hw/misc/aspeed_i3c.c | 2 +- hw/misc/aspeed_peci.c | 2 +- hw/misc/bcm2835_thermal.c | 2 +- hw/misc/imx6ul_ccm.c | 2 +- hw/misc/imx7_src.c | 2 +- hw/misc/iotkit-secctl.c | 2 +- hw/misc/iotkit-sysctl.c | 2 +- hw/misc/iotkit-sysinfo.c | 2 +- hw/misc/mps2-fpgaio.c | 2 +- hw/misc/mps2-scc.c | 2 +- hw/misc/npcm7xx_mft.c | 2 +- hw/misc/npcm7xx_pwm.c | 2 +- hw/misc/sifive_e_aon.c | 2 +- hw/misc/stm32l4x5_rcc.c | 2 +- hw/misc/tz-mpc.c | 2 +- hw/misc/tz-msc.c | 2 +- hw/misc/tz-ppc.c | 2 +- hw/misc/xlnx-versal-cframe-reg.c | 2 +- hw/misc/zynq_slcr.c | 2 +- hw/net/cadence_gem.c | 2 +- hw/net/msf2-emac.c | 2 +- hw/net/npcm_gmac.c | 2 +- hw/net/npcm_pcs.c | 2 +- hw/net/smc91c111.c | 2 +- hw/pci-host/aspeed_pcie.c | 2 +- hw/pci-host/bonito.c | 2 +- hw/pci-host/gt64120.c | 2 +- hw/rtc/ls7a_rtc.c | 2 +- hw/sd/sd.c | 2 +- hw/sensor/tmp105.c | 2 +- hw/ssi/ibex_spi_host.c | 2 +- hw/ssi/npcm_pspi.c | 2 +- hw/timer/bcm2835_systmr.c | 2 +- hw/timer/cmsdk-apb-dualtimer.c | 2 +- hw/timer/cmsdk-apb-timer.c | 2 +- hw/timer/renesas_cmt.c | 2 +- hw/timer/renesas_tmr.c | 2 +- hw/timer/sifive_pwm.c | 2 +- hw/timer/sse-counter.c | 2 +- hw/timer/sse-timer.c | 2 +- hw/watchdog/allwinner-wdt.c | 2 +- hw/watchdog/cmsdk-apb-watchdog.c | 2 +- target/tricore/helper.c | 2 +- tests/qtest/sdhci-test.c | 2 +- tests/qtest/sifive-e-aon-watchdog-test.c | 2 +- tests/qtest/stm32l4x5_rcc-test.c | 2 +- tests/qtest/stm32l4x5_usart-test.c | 2 +- 95 files changed, 94 insertions(+), 94 deletions(-) rename include/hw/{ =3D> core}/registerfields.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index f6e9ad535fa..55cdcc46752 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3560,7 +3560,7 @@ M: Alistair Francis S: Maintained F: hw/core/register.c F: include/hw/register.h -F: include/hw/registerfields.h +F: include/hw/core/registerfields.h =20 Rust M: Manos Pitsidianakis diff --git a/docs/devel/style.rst b/docs/devel/style.rst index 941fe14bfd4..12e509d10de 100644 --- a/docs/devel/style.rst +++ b/docs/devel/style.rst @@ -433,7 +433,7 @@ We also suggest avoiding bitfields even in structures w= here the exact layout does not matter, unless you can show that they provide a significant usability benefit. =20 -We encourage the usage of ``include/hw/registerfields.h`` as a safe replac= ement +We encourage the usage of ``include/hw/core/registerfields.h`` as a safe r= eplacement for bitfields. =20 Reserved namespaces in C and POSIX diff --git a/hw/arm/smmuv3-internal.h b/hw/arm/smmuv3-internal.h index b6b7399347f..d15031f2651 100644 --- a/hw/arm/smmuv3-internal.h +++ b/hw/arm/smmuv3-internal.h @@ -21,7 +21,7 @@ #ifndef HW_ARM_SMMUV3_INTERNAL_H #define HW_ARM_SMMUV3_INTERNAL_H =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/arm/smmu-common.h" =20 typedef enum SMMUTranslationStatus { diff --git a/hw/intc/gic_internal.h b/hw/intc/gic_internal.h index 8ddbf554c69..b821f1feb3b 100644 --- a/hw/intc/gic_internal.h +++ b/hw/intc/gic_internal.h @@ -21,7 +21,7 @@ #ifndef QEMU_ARM_GIC_INTERNAL_H #define QEMU_ARM_GIC_INTERNAL_H =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/intc/arm_gic.h" =20 #define ALL_CPU_MASK ((unsigned)(((1 << GIC_NCPU) - 1))) diff --git a/hw/intc/gicv3_internal.h b/hw/intc/gicv3_internal.h index fc586524f56..880dbe52d86 100644 --- a/hw/intc/gicv3_internal.h +++ b/hw/intc/gicv3_internal.h @@ -24,7 +24,7 @@ #ifndef QEMU_ARM_GICV3_INTERNAL_H #define QEMU_ARM_GICV3_INTERNAL_H =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/intc/arm_gicv3_common.h" =20 /* Distributor registers, as offsets from the distributor base address */ diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 9f768c418e0..3e81821dd1e 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -24,7 +24,7 @@ #ifndef SDHCI_INTERNAL_H #define SDHCI_INTERNAL_H =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" =20 /* R/W SDMA System Address register 0x0 */ #define SDHC_SYSAD 0x00 diff --git a/include/block/nvme.h b/include/block/nvme.h index 9fa2ecaf281..f6373d458bc 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -1,7 +1,7 @@ #ifndef BLOCK_NVME_H #define BLOCK_NVME_H =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" =20 typedef struct QEMU_PACKED NvmeBar { uint64_t cap; diff --git a/include/block/ufs.h b/include/block/ufs.h index a3ee62b027a..ede4aff08ea 100644 --- a/include/block/ufs.h +++ b/include/block/ufs.h @@ -3,7 +3,7 @@ #ifndef BLOCK_UFS_H #define BLOCK_UFS_H =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" =20 typedef struct QEMU_PACKED UfsReg { uint32_t cap; diff --git a/include/fpu/softfloat-types.h b/include/fpu/softfloat-types.h index 1af2a0cb14b..8f82fdfc975 100644 --- a/include/fpu/softfloat-types.h +++ b/include/fpu/softfloat-types.h @@ -80,7 +80,7 @@ this code that are retained. #ifndef SOFTFLOAT_TYPES_H #define SOFTFLOAT_TYPES_H =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" =20 /* * Software IEC/IEEE floating-point types. diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h index 9d0fe6f2f96..d2bf6637c54 100644 --- a/include/hw/acpi/tpm.h +++ b/include/hw/acpi/tpm.h @@ -17,7 +17,7 @@ #define HW_ACPI_TPM_H =20 #include "qemu/units.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/acpi/aml-build.h" #include "system/tpm.h" =20 diff --git a/include/hw/char/nrf51_uart.h b/include/hw/char/nrf51_uart.h index 03d8c2a20d2..7a54db746bd 100644 --- a/include/hw/char/nrf51_uart.h +++ b/include/hw/char/nrf51_uart.h @@ -13,7 +13,7 @@ =20 #include "hw/sysbus.h" #include "chardev/char-fe.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "qom/object.h" =20 #define UART_FIFO_LENGTH 6 diff --git a/include/hw/registerfields.h b/include/hw/core/registerfields.h similarity index 100% rename from include/hw/registerfields.h rename to include/hw/core/registerfields.h diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h index 2daacc10ce0..c9c2620a8a3 100644 --- a/include/hw/i2c/aspeed_i2c.h +++ b/include/hw/i2c/aspeed_i2c.h @@ -22,7 +22,7 @@ =20 #include "hw/i2c/i2c.h" #include "hw/sysbus.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "qom/object.h" =20 #define TYPE_ASPEED_I2C "aspeed.i2c" diff --git a/include/hw/misc/bcm2835_cprman_internals.h b/include/hw/misc/b= cm2835_cprman_internals.h index 7617aff96fd..de75139cfdd 100644 --- a/include/hw/misc/bcm2835_cprman_internals.h +++ b/include/hw/misc/bcm2835_cprman_internals.h @@ -9,7 +9,7 @@ #ifndef HW_MISC_BCM2835_CPRMAN_INTERNALS_H #define HW_MISC_BCM2835_CPRMAN_INTERNALS_H =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/misc/bcm2835_cprman.h" =20 #define TYPE_CPRMAN_PLL "bcm2835-cprman-pll" diff --git a/include/hw/misc/stm32l4x5_rcc_internals.h b/include/hw/misc/st= m32l4x5_rcc_internals.h index ff1c834f694..1e044604c87 100644 --- a/include/hw/misc/stm32l4x5_rcc_internals.h +++ b/include/hw/misc/stm32l4x5_rcc_internals.h @@ -18,7 +18,7 @@ #ifndef HW_STM32L4X5_RCC_INTERNALS_H #define HW_STM32L4X5_RCC_INTERNALS_H =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/misc/stm32l4x5_rcc.h" =20 #define TYPE_RCC_CLOCK_MUX "stm32l4x5-rcc-clock-mux" diff --git a/include/hw/register.h b/include/hw/register.h index b3d20fee7d3..1f265f4ed71 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -13,7 +13,7 @@ =20 #include "hw/core/qdev.h" #include "system/memory.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "qom/object.h" =20 typedef struct RegisterInfo RegisterInfo; diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h index 48a406a5fbc..f5ec7484c1d 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -21,7 +21,7 @@ #ifndef TARGET_ARM_CPREGS_H #define TARGET_ARM_CPREGS_H =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "exec/memop.h" #include "target/arm/kvm-consts.h" #include "cpu.h" diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 579fa8f8f42..c86a4e667dc 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -20,7 +20,7 @@ #ifndef TARGET_ARM_FEATURES_H #define TARGET_ARM_FEATURES_H =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "qemu/host-utils.h" #include "cpu.h" #include "cpu-sysregs.h" diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 39f2b2e54de..9579d43ba33 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -22,7 +22,7 @@ =20 #include "kvm-consts.h" #include "qemu/cpu-float.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "cpu-qom.h" #include "exec/cpu-common.h" #include "exec/cpu-defs.h" diff --git a/target/arm/internals.h b/target/arm/internals.h index 75677945af3..9cd4bf74efb 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -29,7 +29,7 @@ #include "exec/vaddr.h" #include "exec/breakpoint.h" #include "accel/tcg/tb-cpu-state.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "tcg/tcg-gvec-desc.h" #include "system/memory.h" #include "syndrome.h" diff --git a/target/arm/mmuidx-internal.h b/target/arm/mmuidx-internal.h index 962b0538526..776e31c9ba5 100644 --- a/target/arm/mmuidx-internal.h +++ b/target/arm/mmuidx-internal.h @@ -8,7 +8,7 @@ =20 #include "mmuidx.h" #include "tcg/debug-assert.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" =20 =20 FIELD(MMUIDXINFO, EL, 0, 2) diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index 43a854f5172..656b7dc0449 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -25,7 +25,7 @@ #include "exec/cpu-defs.h" #include "hex_regs.h" #include "mmvec/mmvec.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" =20 #ifndef CONFIG_USER_ONLY #error "Hexagon does not support system emulation" diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index c652ef945ac..012e54f8f6f 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -27,7 +27,7 @@ #include "system/memory.h" #include "qemu/cpu-float.h" #include "qemu/interval-tree.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" =20 #define MMU_KERNEL_IDX 0 #define MMU_KERNEL_P_IDX 1 diff --git a/target/loongarch/cpu-csr.h b/target/loongarch/cpu-csr.h index 68989474987..77555929264 100644 --- a/target/loongarch/cpu-csr.h +++ b/target/loongarch/cpu-csr.h @@ -8,7 +8,7 @@ #ifndef LOONGARCH_CPU_CSR_H #define LOONGARCH_CPU_CSR_H =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" =20 /* Based on kernel definitions: arch/loongarch/include/asm/loongarch.h */ =20 diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h index 1a14469b3bc..92af68ea7f8 100644 --- a/target/loongarch/cpu.h +++ b/target/loongarch/cpu.h @@ -13,7 +13,7 @@ #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "fpu/softfloat-types.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "qemu/timer.h" #ifndef CONFIG_USER_ONLY #include "system/memory.h" diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 787020f6f90..dbebae89dce 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -27,7 +27,7 @@ #include "exec/cpu-interrupt.h" #include "cpu-qom.h" #include "qom/object.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" =20 #define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU =20 diff --git a/target/ppc/internal.h b/target/ppc/internal.h index 7723350227f..58f315ffcf5 100644 --- a/target/ppc/internal.h +++ b/target/ppc/internal.h @@ -19,7 +19,7 @@ #define PPC_INTERNAL_H =20 #include "exec/breakpoint.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "exec/page-protection.h" #include "accel/tcg/tb-cpu-state.h" =20 diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index b54cd78f8f7..90b3e951053 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -21,7 +21,7 @@ #define RISCV_CPU_H =20 #include "hw/core/cpu.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/qdev-properties.h" #include "exec/cpu-common.h" #include "exec/cpu-defs.h" diff --git a/target/riscv/internals.h b/target/riscv/internals.h index 172296f12e2..35b923c4bf5 100644 --- a/target/riscv/internals.h +++ b/target/riscv/internals.h @@ -20,7 +20,7 @@ #define RISCV_CPU_INTERNALS_H =20 #include "exec/cpu-common.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "fpu/softfloat-types.h" #include "target/riscv/cpu_bits.h" =20 diff --git a/target/riscv/vector_internals.h b/target/riscv/vector_internal= s.h index 8eee7e5c31c..5681b818153 100644 --- a/target/riscv/vector_internals.h +++ b/target/riscv/vector_internals.h @@ -20,7 +20,7 @@ #define TARGET_RISCV_VECTOR_INTERNALS_H =20 #include "qemu/bitops.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "cpu.h" #include "tcg/tcg-gvec-desc.h" #include "internals.h" diff --git a/target/rx/cpu.h b/target/rx/cpu.h index ba5761b6472..b3b1ecff5af 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -20,7 +20,7 @@ #define RX_CPU_H =20 #include "qemu/bitops.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "cpu-qom.h" =20 #include "exec/cpu-common.h" diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index 82085fbc32f..ab46192e261 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -21,7 +21,7 @@ #define TRICORE_CPU_H =20 #include "cpu-qom.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "qemu/cpu-float.h" diff --git a/hw/adc/npcm7xx_adc.c b/hw/adc/npcm7xx_adc.c index 44079791cbd..3584c27c75a 100644 --- a/hw/adc/npcm7xx_adc.c +++ b/hw/adc/npcm7xx_adc.c @@ -18,7 +18,7 @@ #include "hw/adc/npcm7xx_adc.h" #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index 42ceb097ae8..b6fc95df3b6 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -18,7 +18,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/arm/armsse.h" #include "hw/arm/armsse-version.h" #include "hw/arm/boot.h" diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 637525a7e3f..1276bb4df40 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -20,7 +20,7 @@ #include "hw/arm/bcm2836.h" #include "hw/arm/bcm2838.h" #include "hw/arm/raspi_platform.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "qemu/error-report.h" #include "hw/core/boards.h" #include "hw/core/loader.h" diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index ead28500c73..3eeb8f447e6 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -14,7 +14,7 @@ #include "hw/arm/machines-qom.h" #include "hw/arm/raspi_platform.h" #include "hw/display/bcm2835_fb.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "qemu/error-report.h" #include "system/device_tree.h" #include "hw/core/boards.h" diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c index c3645a553ec..1a83e4a9bd1 100644 --- a/hw/char/cmsdk-apb-uart.c +++ b/hw/char/cmsdk-apb-uart.c @@ -22,7 +22,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "chardev/char-fe.h" #include "chardev/char-serial.h" #include "hw/char/cmsdk-apb-uart.h" diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c index 3166f6d3094..127d219df3c 100644 --- a/hw/char/ibex_uart.c +++ b/hw/char/ibex_uart.c @@ -31,7 +31,7 @@ #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/renesas_sci.c b/hw/char/renesas_sci.c index f1c5d5ae6b3..dc2810a9b11 100644 --- a/hw/char/renesas_sci.c +++ b/hw/char/renesas_sci.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" #include "hw/char/renesas_sci.h" diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c index 664d03d6b96..736f1e764e6 100644 --- a/hw/char/stm32l4x5_usart.c +++ b/hw/char/stm32l4x5_usart.c @@ -28,7 +28,7 @@ #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "trace.h" =20 =20 diff --git a/hw/gpio/aspeed_gpio.c b/hw/gpio/aspeed_gpio.c index 85a5acd7087..d9237d4360f 100644 --- a/hw/gpio/aspeed_gpio.c +++ b/hw/gpio/aspeed_gpio.c @@ -16,7 +16,7 @@ #include "hw/core/irq.h" #include "migration/vmstate.h" #include "trace.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" =20 #define GPIOS_PER_GROUP 8 =20 diff --git a/hw/i2c/arm_sbcon_i2c.c b/hw/i2c/arm_sbcon_i2c.c index 979ccbe0ed6..688f45c3139 100644 --- a/hw/i2c/arm_sbcon_i2c.c +++ b/hw/i2c/arm_sbcon_i2c.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/i2c/arm_sbcon_i2c.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "qemu/log.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c index e3ca77865bd..1f9ce131bf7 100644 --- a/hw/i2c/aspeed_i2c.c +++ b/hw/i2c/aspeed_i2c.c @@ -29,7 +29,7 @@ #include "hw/i2c/aspeed_i2c.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "trace.h" =20 /* Enable SLAVE_ADDR_RX_MATCH always */ diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c index d92305b9ca1..f14c340b602 100644 --- a/hw/intc/aspeed_intc.c +++ b/hw/intc/aspeed_intc.c @@ -11,7 +11,7 @@ #include "hw/core/irq.h" #include "qemu/log.h" #include "trace.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "qapi/error.h" =20 /* diff --git a/hw/intc/rx_icu.c b/hw/intc/rx_icu.c index 788afe6b1a0..87cdc6cbdef 100644 --- a/hw/intc/rx_icu.c +++ b/hw/intc/rx_icu.c @@ -27,7 +27,7 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "hw/core/irq.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/qdev-properties.h" #include "hw/intc/rx_icu.h" #include "migration/vmstate.h" diff --git a/hw/misc/armsse-cpu-pwrctrl.c b/hw/misc/armsse-cpu-pwrctrl.c index 66e9218f277..87770facfce 100644 --- a/hw/misc/armsse-cpu-pwrctrl.c +++ b/hw/misc/armsse-cpu-pwrctrl.c @@ -22,7 +22,7 @@ #include "qapi/error.h" #include "migration/vmstate.h" #include "hw/sysbus.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/misc/armsse-cpu-pwrctrl.h" =20 REG32(CPUPWRCFG, 0x0) diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c index 3a52bb5381f..03833125514 100644 --- a/hw/misc/armsse-cpuid.c +++ b/hw/misc/armsse-cpuid.c @@ -24,7 +24,7 @@ #include "trace.h" #include "qapi/error.h" #include "hw/sysbus.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/misc/armsse-cpuid.h" #include "hw/core/qdev-properties.h" =20 diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c index 2673c2de3ef..6fbe2cca37e 100644 --- a/hw/misc/armsse-mhu.c +++ b/hw/misc/armsse-mhu.c @@ -22,7 +22,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/irq.h" #include "hw/misc/armsse-mhu.h" =20 diff --git a/hw/misc/aspeed_i3c.c b/hw/misc/aspeed_i3c.c index 37a05b9ce27..ac6db214ee2 100644 --- a/hw/misc/aspeed_i3c.c +++ b/hw/misc/aspeed_i3c.c @@ -11,7 +11,7 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "hw/misc/aspeed_i3c.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "migration/vmstate.h" diff --git a/hw/misc/aspeed_peci.c b/hw/misc/aspeed_peci.c index cf902a8ab8c..0569ee57d1f 100644 --- a/hw/misc/aspeed_peci.c +++ b/hw/misc/aspeed_peci.c @@ -11,7 +11,7 @@ #include "qemu/log.h" #include "hw/core/irq.h" #include "hw/misc/aspeed_peci.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "trace.h" =20 #define ASPEED_PECI_CC_RSP_SUCCESS (0x40U) diff --git a/hw/misc/bcm2835_thermal.c b/hw/misc/bcm2835_thermal.c index 33bfc91c7aa..0dc1be15b4a 100644 --- a/hw/misc/bcm2835_thermal.c +++ b/hw/misc/bcm2835_thermal.c @@ -10,7 +10,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/misc/bcm2835_thermal.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "migration/vmstate.h" =20 REG32(CTL, 0) diff --git a/hw/misc/imx6ul_ccm.c b/hw/misc/imx6ul_ccm.c index 7f3ae61710c..c4f6e372fe1 100644 --- a/hw/misc/imx6ul_ccm.c +++ b/hw/misc/imx6ul_ccm.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "migration/vmstate.h" #include "hw/misc/imx6ul_ccm.h" #include "qemu/log.h" diff --git a/hw/misc/imx7_src.c b/hw/misc/imx7_src.c index df0b0a69057..77f13bd020b 100644 --- a/hw/misc/imx7_src.c +++ b/hw/misc/imx7_src.c @@ -17,7 +17,7 @@ #include "qemu/module.h" #include "target/arm/arm-powerctl.h" #include "hw/core/cpu.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" =20 #include "trace.h" =20 diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c index 64e94a76479..832b0217774 100644 --- a/hw/misc/iotkit-secctl.c +++ b/hw/misc/iotkit-secctl.c @@ -16,7 +16,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/irq.h" #include "hw/misc/iotkit-secctl.h" #include "hw/arm/armsse-version.h" diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c index a9c3568c216..d673ae326bc 100644 --- a/hw/misc/iotkit-sysctl.c +++ b/hw/misc/iotkit-sysctl.c @@ -25,7 +25,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/misc/iotkit-sysctl.h" #include "hw/core/qdev-properties.h" #include "hw/arm/armsse-version.h" diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c index a53b1f51802..3b4d228e3ef 100644 --- a/hw/misc/iotkit-sysinfo.c +++ b/hw/misc/iotkit-sysinfo.c @@ -23,7 +23,7 @@ #include "trace.h" #include "qapi/error.h" #include "hw/sysbus.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/misc/iotkit-sysinfo.h" #include "hw/core/qdev-properties.h" #include "hw/arm/armsse-version.h" diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c index f3d51fd2286..9cd5e9884c0 100644 --- a/hw/misc/mps2-fpgaio.c +++ b/hw/misc/mps2-fpgaio.c @@ -22,7 +22,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/misc/mps2-fpgaio.h" #include "hw/misc/led.h" #include "hw/core/qdev-properties.h" diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index 56aa0135072..06d436cf58e 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -25,7 +25,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "migration/vmstate.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/misc/mps2-scc.h" #include "hw/misc/led.h" #include "hw/core/qdev-properties.h" diff --git a/hw/misc/npcm7xx_mft.c b/hw/misc/npcm7xx_mft.c index 21e74385c71..742166c4e82 100644 --- a/hw/misc/npcm7xx_mft.c +++ b/hw/misc/npcm7xx_mft.c @@ -20,7 +20,7 @@ #include "hw/core/qdev-properties.h" #include "hw/misc/npcm7xx_mft.h" #include "hw/misc/npcm7xx_pwm.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/misc/npcm7xx_pwm.c b/hw/misc/npcm7xx_pwm.c index 1b010e51ec0..3ee34820c8a 100644 --- a/hw/misc/npcm7xx_pwm.c +++ b/hw/misc/npcm7xx_pwm.c @@ -19,7 +19,7 @@ #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" #include "hw/misc/npcm7xx_pwm.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/error-report.h" diff --git a/hw/misc/sifive_e_aon.c b/hw/misc/sifive_e_aon.c index 4d6e015ca38..0e82ae3758b 100644 --- a/hw/misc/sifive_e_aon.c +++ b/hw/misc/sifive_e_aon.c @@ -20,7 +20,7 @@ #include "qemu/timer.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/misc/sifive_e_aon.h" #include "qapi/visitor.h" #include "qapi/error.h" diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c index cf7fa28cbe9..85095871340 100644 --- a/hw/misc/stm32l4x5_rcc.c +++ b/hw/misc/stm32l4x5_rcc.c @@ -28,7 +28,7 @@ #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "trace.h" =20 #define HSE_DEFAULT_FRQ 48000000ULL diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c index fb5d232bff5..65517d390d3 100644 --- a/hw/misc/tz-mpc.c +++ b/hw/misc/tz-mpc.c @@ -16,7 +16,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/irq.h" #include "hw/misc/tz-mpc.h" #include "hw/core/qdev-properties.h" diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c index 3e33455d421..dd845193d64 100644 --- a/hw/misc/tz-msc.c +++ b/hw/misc/tz-msc.c @@ -16,7 +16,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/irq.h" #include "hw/misc/tz-msc.h" #include "hw/core/qdev-properties.h" diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c index a41c6011fba..7b812a034b2 100644 --- a/hw/misc/tz-ppc.c +++ b/hw/misc/tz-ppc.c @@ -16,7 +16,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/irq.h" #include "hw/misc/tz-ppc.h" #include "hw/core/qdev-properties.h" diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-= reg.c index 33a4ece26f6..a5a5e41f3e3 100644 --- a/hw/misc/xlnx-versal-cframe-reg.c +++ b/hw/misc/xlnx-versal-cframe-reg.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/units.h" diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index d1900a2b948..d7d490b093d 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -21,7 +21,7 @@ #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/qdev-clock.h" #include "qom/object.h" #include "hw/core/qdev-properties.h" diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index fe9747fdb6f..b568fa3392d 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -28,7 +28,7 @@ #include "hw/core/irq.h" #include "hw/net/cadence_gem.h" #include "hw/core/qdev-properties.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c index ac01d1ce472..077485c95d9 100644 --- a/hw/net/msf2-emac.c +++ b/hw/net/msf2-emac.c @@ -31,7 +31,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qapi/error.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/net/msf2-emac.h" #include "hw/net/mii.h" #include "hw/core/irq.h" diff --git a/hw/net/npcm_gmac.c b/hw/net/npcm_gmac.c index 5e32cd3edf3..123fb92ca40 100644 --- a/hw/net/npcm_gmac.c +++ b/hw/net/npcm_gmac.c @@ -23,7 +23,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/net/mii.h" #include "hw/net/npcm_gmac.h" #include "migration/vmstate.h" diff --git a/hw/net/npcm_pcs.c b/hw/net/npcm_pcs.c index 6aec105271a..ae078e14c38 100644 --- a/hw/net/npcm_pcs.c +++ b/hw/net/npcm_pcs.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" =20 #include "exec/hwaddr.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/net/npcm_pcs.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index e3bf3b0e726..d6f57bc004a 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -13,7 +13,7 @@ #include "net/net.h" #include "hw/core/irq.h" #include "hw/net/smc91c111.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/pci-host/aspeed_pcie.c b/hw/pci-host/aspeed_pcie.c index 27f1078e3a5..83a1c7075c3 100644 --- a/hw/pci-host/aspeed_pcie.c +++ b/hw/pci-host/aspeed_pcie.c @@ -18,7 +18,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/core/qdev-properties.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/irq.h" #include "hw/pci/pci_host.h" #include "hw/pci/pcie_port.h" diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 90040045c1f..ff2f5c966eb 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -50,7 +50,7 @@ #include "migration/vmstate.h" #include "system/runstate.h" #include "hw/misc/unimp.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "qom/object.h" #include "trace.h" =20 diff --git a/hw/pci-host/gt64120.c b/hw/pci-host/gt64120.c index 2339f10a30a..d361c457edb 100644 --- a/hw/pci-host/gt64120.c +++ b/hw/pci-host/gt64120.c @@ -30,7 +30,7 @@ #include "qemu/log.h" #include "qemu/bswap.h" #include "hw/core/qdev-properties.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" #include "hw/misc/empty_slot.h" diff --git a/hw/rtc/ls7a_rtc.c b/hw/rtc/ls7a_rtc.c index 234a7e97698..54943f60b80 100644 --- a/hw/rtc/ls7a_rtc.c +++ b/hw/rtc/ls7a_rtc.c @@ -16,7 +16,7 @@ #include "migration/vmstate.h" #include "hw/misc/unimp.h" #include "system/rtc.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" =20 #define SYS_TOYTRIM 0x20 #define SYS_TOYWRITE0 0x24 diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 5aa34f1d5bd..5a1fda38a7b 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -36,7 +36,7 @@ #include "qemu/units.h" #include "qemu/cutils.h" #include "hw/core/irq.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "system/block-backend.h" #include "hw/sd/sd.h" #include "migration/vmstate.h" diff --git a/hw/sensor/tmp105.c b/hw/sensor/tmp105.c index 4e5c968bcc7..c5089d74f4b 100644 --- a/hw/sensor/tmp105.c +++ b/hw/sensor/tmp105.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "qemu/module.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "trace.h" =20 FIELD(CONFIG, SHUTDOWN_MODE, 0, 1) diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c index 50cf08de9c9..1e574c3fcb8 100644 --- a/hw/ssi/ibex_spi_host.c +++ b/hw/ssi/ibex_spi_host.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/ssi/ibex_spi_host.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" diff --git a/hw/ssi/npcm_pspi.c b/hw/ssi/npcm_pspi.c index 1f11e1f8a46..2e05d5dacb2 100644 --- a/hw/ssi/npcm_pspi.c +++ b/hw/ssi/npcm_pspi.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" =20 #include "hw/core/irq.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/ssi/npcm_pspi.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/timer/bcm2835_systmr.c b/hw/timer/bcm2835_systmr.c index 7929aaa882a..00bcfcd05c6 100644 --- a/hw/timer/bcm2835_systmr.c +++ b/hw/timer/bcm2835_systmr.c @@ -16,7 +16,7 @@ #include "qemu/log.h" #include "qemu/timer.h" #include "hw/timer/bcm2835_systmr.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "migration/vmstate.h" #include "trace.h" =20 diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c index bcb6f8e43d7..39b1fa3a149 100644 --- a/hw/timer/cmsdk-apb-dualtimer.c +++ b/hw/timer/cmsdk-apb-dualtimer.c @@ -24,7 +24,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/qdev-clock.h" #include "hw/timer/cmsdk-apb-dualtimer.h" #include "migration/vmstate.h" diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c index d80bf1f96d0..e8b6601097c 100644 --- a/hw/timer/cmsdk-apb-timer.c +++ b/hw/timer/cmsdk-apb-timer.c @@ -34,7 +34,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/qdev-clock.h" #include "hw/timer/cmsdk-apb-timer.h" #include "migration/vmstate.h" diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c index 35962e66c32..a5cc7ebd270 100644 --- a/hw/timer/renesas_cmt.c +++ b/hw/timer/renesas_cmt.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/qdev-properties.h" #include "hw/timer/renesas_cmt.h" #include "migration/vmstate.h" diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c index 2e7d7d4543a..c917f70de22 100644 --- a/hw/timer/renesas_tmr.c +++ b/hw/timer/renesas_tmr.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/qdev-properties.h" #include "hw/timer/renesas_tmr.h" #include "migration/vmstate.h" diff --git a/hw/timer/sifive_pwm.c b/hw/timer/sifive_pwm.c index 8fda5445e74..780eaa50799 100644 --- a/hw/timer/sifive_pwm.c +++ b/hw/timer/sifive_pwm.c @@ -29,7 +29,7 @@ #include "hw/core/irq.h" #include "hw/timer/sifive_pwm.h" #include "hw/core/qdev-properties.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c index de9d354483b..39d140347e5 100644 --- a/hw/timer/sse-counter.c +++ b/hw/timer/sse-counter.c @@ -33,7 +33,7 @@ #include "trace.h" #include "hw/timer/sse-counter.h" #include "hw/sysbus.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" #include "migration/vmstate.h" diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c index 50d1de58055..62381e07e06 100644 --- a/hw/timer/sse-timer.c +++ b/hw/timer/sse-timer.c @@ -42,7 +42,7 @@ #include "hw/timer/sse-counter.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" diff --git a/hw/watchdog/allwinner-wdt.c b/hw/watchdog/allwinner-wdt.c index 8fcd7766752..68b600689a5 100644 --- a/hw/watchdog/allwinner-wdt.c +++ b/hw/watchdog/allwinner-wdt.c @@ -26,7 +26,7 @@ #include "qemu/module.h" #include "trace.h" #include "hw/sysbus.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/watchdog/allwinner-wdt.h" #include "system/watchdog.h" #include "migration/vmstate.h" diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watch= dog.c index 90d14e342b0..ceae792580e 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -29,7 +29,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/core/qdev-clock.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" #include "migration/vmstate.h" diff --git a/target/tricore/helper.c b/target/tricore/helper.c index 7574111c87d..7ee8c7fd699 100644 --- a/target/tricore/helper.c +++ b/target/tricore/helper.c @@ -17,7 +17,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "cpu.h" #include "exec/cputlb.h" #include "accel/tcg/cpu-mmu-index.h" diff --git a/tests/qtest/sdhci-test.c b/tests/qtest/sdhci-test.c index 6275e7626c2..7b32711c8f8 100644 --- a/tests/qtest/sdhci-test.c +++ b/tests/qtest/sdhci-test.c @@ -9,7 +9,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "libqtest.h" #include "qemu/module.h" #include "libqos/pci-pc.h" diff --git a/tests/qtest/sifive-e-aon-watchdog-test.c b/tests/qtest/sifive-= e-aon-watchdog-test.c index 1f313d16ad8..277f1b8360b 100644 --- a/tests/qtest/sifive-e-aon-watchdog-test.c +++ b/tests/qtest/sifive-e-aon-watchdog-test.c @@ -20,7 +20,7 @@ #include "qemu/timer.h" #include "qemu/bitops.h" #include "libqtest.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "hw/misc/sifive_e_aon.h" =20 FIELD(AON_WDT_WDOGCFG, SCALE, 0, 4) diff --git a/tests/qtest/stm32l4x5_rcc-test.c b/tests/qtest/stm32l4x5_rcc-t= est.c index d927c655d13..4ab0a0ab29f 100644 --- a/tests/qtest/stm32l4x5_rcc-test.c +++ b/tests/qtest/stm32l4x5_rcc-test.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "libqtest-single.h" #include "hw/misc/stm32l4x5_rcc_internals.h" =20 diff --git a/tests/qtest/stm32l4x5_usart-test.c b/tests/qtest/stm32l4x5_usa= rt-test.c index 98a7472307f..a72c5a685d1 100644 --- a/tests/qtest/stm32l4x5_usart-test.c +++ b/tests/qtest/stm32l4x5_usart-test.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "hw/misc/stm32l4x5_rcc_internals.h" -#include "hw/registerfields.h" +#include "hw/core/registerfields.h" #include "stm32l4x5.h" =20 #define RCC_BASE_ADDR 0x40021000 --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764249616; cv=none; d=zohomail.com; s=zohoarc; b=EwPDWHWiQTwDXiGc1ajTgP96CrDoy2unseJiUOPTPzBYjUaEbExlstGklllOisSZuPSUXVyZ9MoY0TE3Q/8T1bt7r0056J2uSCUlUBDMsi/qeSofDajufA5A8EkXRg9Qya8xAB7jUPRbHaWCMpx+vgHmGQlDuLymfvgK94bVJFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764249616; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=QAcMOGF098GkVRo7S2wJ+dMzUkmSvgw+wyU7VGS9qHg=; b=XS2X11vyEym2iDAVzgM64Z0LWzC+IluQC9ZMYf+H39CwNSqjt4v5mJanDUQTv1LzY12BJC+KwWUl3d7Yh2k+tiF+JTsQq18CeWFb6EG39Bw7ZZ4J+IE/TvO+4u8lhtTQdaV+ajgVPz6F0FMvy5btlx7oIiKObir2kD4XASSrzJI= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764249616872545.4700267590688; Thu, 27 Nov 2025 05:20:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObtE-0006FR-QC; Thu, 27 Nov 2025 08:18:29 -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 1vObr4-0002jv-Qd for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:20 -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 1vObqx-0001IA-84 for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:11 -0500 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-616-M6KzBw2gMb-i09Qt7QO-Fg-1; Thu, 27 Nov 2025 08:15:58 -0500 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-64097bef0e2so1312167a12.3 for ; Thu, 27 Nov 2025 05:15:58 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f5a7b4bcsm152993566b.71.2025.11.27.05.15.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QAcMOGF098GkVRo7S2wJ+dMzUkmSvgw+wyU7VGS9qHg=; b=MWL3G1XpWEEptSD+RGgtjR3k/4GFUSFR5YyiRMaSkhOKSjrofVX33FqvZmC5FlXFQvG7qQ wJS7qclKi0LLWJY6vdwXL6qlzQWxL40zf86tpGITwzhRf6UKnwTPK6QO6o5Z0CHnW8JjPD BovGbTZQitmS8btnCBb23M/rmE2ae5I= X-MC-Unique: M6KzBw2gMb-i09Qt7QO-Fg-1 X-Mimecast-MFC-AGG-ID: M6KzBw2gMb-i09Qt7QO-Fg_1764249357 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249356; x=1764854156; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QAcMOGF098GkVRo7S2wJ+dMzUkmSvgw+wyU7VGS9qHg=; b=F1DA08zaCr2TWWaiGm0n00CK4QM+T7IFAN+QaNna+tA8xDJJB7pd4foJBwKxbANIyK +tUmc7gZqXXvgyqGwa+ypj2L6OVebdTAnC5vpwJ3RcJbxXJc1gReRE4vmPR91fbLufrw gyLnBarnH1ppWNhyjPk8h8eBcRgj0XZkxZODW5i2XJ4H7qg1eMruUmO2axoowNoDYCwd ESD8jbu2qj9oUpjhHdgwW9w0FWVHgaB3c9kGy3antptO0T0OcWr3zQEelZcU+5BpO2Xl TTuG7b6HVyIUfglipdCqcekwXMKrL4uYPANHV65XYgmK+ZtPsy0u8vLXH9gscSmAQK4L Nprw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249356; x=1764854156; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=QAcMOGF098GkVRo7S2wJ+dMzUkmSvgw+wyU7VGS9qHg=; b=LdSoIwQ+9bU3KCzQpVTgG5CsBbTEtPR/gEJX6ybA7S2F2tqqo6pYTY8mi5hMB6w92D W5hkrDHgkKkOZpIyTkjSesqc7qJXPaOAZau3vnG2c+ilJ+PmS113KdSpUIdph2g68HX/ roZmyTEH/kqjzIVqqn9h08iFkRHdgCPAbR6ojHimIITCycrJZCyZh1ipAT3ZpVQc3rOS kOJEcd6pw/3WyRrCXkfqewV33xm3+GK7ydUutN1peLZdH19h8eb8trQ7pBzhoUE15niP bBaxg1Qzm8qRaSNXeXEX/YZ9AckoY77afjvZ1nb+3h7fyVL6KJx0biolhnVU6aaL3Y3Z NC6A== X-Gm-Message-State: AOJu0YysHYJOlRa7SgjdKscaL+uijfYgI3T7OBpKryH3TPwtbcUsDVVK p/dTgW1gq/hsKPDqLUmFXzvd0YxzW1r9wnQLhupLtmQUnYLyDoJma5PhOfCy/W9vmYHSpwIKF+J vjA2hNLIbfIIUkYtuN25Q8HjPhEDXzKMgzuiU8k5/9KT41QrJjvxqrcFZcOZ6hi0aYutVVB1EMV NXNj11k5kS4haWR0wmLHr9hOzamyI5KzUZ/UMYstqe X-Gm-Gg: ASbGncu1A7XJOKwL/vnz9DCwO/Y6PmEkkKuXhDWVEMIWoVTQQgxwNK9VZ2FNHDoVg8s 88h0goYdese6Kfy0TQyD4AiyRHxIiNSe0uobjeZtrETWgiPdJchrXZig3owXbDQA7OUAG3r2hqS WSnnUa0deOhQgMuXhudxELl/4ABO3BSpSXCznnyxqx+SoysBpzeWW3NaLWVY49jik2bsZo8k6NT Fi2cQFBzksoDHsIHp//6q45SBB4uDTeGCv8626h3mTdsr6rVLNcuPb6FXFfg7iXBy/zf6qGu34e x2gqdPyCg4CKcy+Wk0EOetzzt4excK0nJJh1+2xMRRPmqKhXfxMjwET+O1/AtIeoxXfxqo3MPsq N/Z7E6i6gBnJsDOEr1KVUuIX7+v8Xign4PQldVIc26MsaSdse/pKP4PjoQ/4XNiuTEqDdj8TRIq jsWEZezbSCIP1Es5Y= X-Received: by 2002:a17:907:9493:b0:b1d:285c:e0ef with SMTP id a640c23a62f3a-b76715e6316mr2583653866b.26.1764249355983; Thu, 27 Nov 2025 05:15:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IF65nBaBHB3gWCott9eOMWbcJQFOlAWBPT14da6hVKkqIb1VDjrHgNMLt/faDZhZykq+Jz/Fw== X-Received: by 2002:a17:907:9493:b0:b1d:285c:e0ef with SMTP id a640c23a62f3a-b76715e6316mr2583647766b.26.1764249355007; Thu, 27 Nov 2025 05:15:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 22/28] include: move hw/register.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:09 +0100 Message-ID: <20251127131516.80807-23-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764249617591019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- MAINTAINERS | 2 +- include/hw/{ =3D> core}/register.h | 0 include/hw/cxl/cxl_component.h | 2 +- include/hw/cxl/cxl_device.h | 2 +- include/hw/dma/xlnx-zdma.h | 2 +- include/hw/dma/xlnx-zynq-devcfg.h | 2 +- include/hw/dma/xlnx_csu_dma.h | 2 +- include/hw/intc/xlnx-pmu-iomod-intc.h | 2 +- include/hw/intc/xlnx-zynqmp-ipi.h | 2 +- include/hw/misc/allwinner-a10-dramc.h | 2 +- include/hw/misc/xlnx-versal-cframe-reg.h | 2 +- include/hw/misc/xlnx-versal-cfu.h | 2 +- include/hw/misc/xlnx-versal-crl.h | 2 +- include/hw/misc/xlnx-versal-pmc-iou-slcr.h | 2 +- include/hw/misc/xlnx-versal-trng.h | 2 +- include/hw/misc/xlnx-versal-xramc.h | 2 +- include/hw/misc/xlnx-zynqmp-apu-ctrl.h | 2 +- include/hw/misc/xlnx-zynqmp-crf.h | 2 +- include/hw/net/xlnx-versal-canfd.h | 2 +- include/hw/net/xlnx-zynqmp-can.h | 2 +- include/hw/nvram/xlnx-bbram.h | 2 +- include/hw/nvram/xlnx-versal-efuse.h | 2 +- include/hw/nvram/xlnx-zynqmp-efuse.h | 2 +- include/hw/pci/pcie_doe.h | 2 +- include/hw/rtc/xlnx-zynqmp-rtc.h | 2 +- include/hw/ssi/xlnx-versal-ospi.h | 2 +- include/hw/usb/hcd-dwc3.h | 2 +- include/hw/usb/xlnx-usb-subsystem.h | 2 +- include/hw/usb/xlnx-versal-usb2-ctrl-regs.h | 2 +- hw/core/register.c | 2 +- hw/dma/xlnx_csu_dma.c | 2 +- hw/intc/xlnx-pmu-iomod-intc.c | 2 +- hw/intc/xlnx-zynqmp-ipi.c | 2 +- hw/misc/xlnx-versal-cframe-reg.c | 2 +- hw/misc/xlnx-versal-cfu.c | 2 +- hw/misc/xlnx-versal-crl.c | 2 +- hw/misc/xlnx-versal-pmc-iou-slcr.c | 2 +- hw/misc/xlnx-versal-xramc.c | 2 +- hw/misc/xlnx-zynqmp-apu-ctrl.c | 2 +- hw/misc/xlnx-zynqmp-crf.c | 2 +- hw/net/can/xlnx-versal-canfd.c | 2 +- hw/net/can/xlnx-zynqmp-can.c | 2 +- hw/rtc/ls7a_rtc.c | 2 +- hw/rtc/xlnx-zynqmp-rtc.c | 2 +- hw/ssi/xilinx_spips.c | 2 +- hw/usb/hcd-dwc3.c | 2 +- hw/usb/xlnx-usb-subsystem.c | 2 +- hw/usb/xlnx-versal-usb2-ctrl-regs.c | 2 +- 48 files changed, 47 insertions(+), 47 deletions(-) rename include/hw/{ =3D> core}/register.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 55cdcc46752..b9cc00a5582 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3559,7 +3559,7 @@ Register API M: Alistair Francis S: Maintained F: hw/core/register.c -F: include/hw/register.h +F: include/hw/core/register.h F: include/hw/core/registerfields.h =20 Rust diff --git a/include/hw/register.h b/include/hw/core/register.h similarity index 100% rename from include/hw/register.h rename to include/hw/core/register.h diff --git a/include/hw/cxl/cxl_component.h b/include/hw/cxl/cxl_component.h index 945ee6ffd04..b0f2aa79143 100644 --- a/include/hw/cxl/cxl_component.h +++ b/include/hw/cxl/cxl_component.h @@ -17,7 +17,7 @@ =20 #include "qemu/range.h" #include "hw/cxl/cxl_cdat.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qapi/error.h" =20 enum reg_type { diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index 89411c80936..165355baf9d 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -12,7 +12,7 @@ =20 #include "hw/cxl/cxl_component.h" #include "hw/pci/pci_device.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/cxl/cxl_events.h" =20 /* diff --git a/include/hw/dma/xlnx-zdma.h b/include/hw/dma/xlnx-zdma.h index 9c57c499102..2d2d4aeefab 100644 --- a/include/hw/dma/xlnx-zdma.h +++ b/include/hw/dma/xlnx-zdma.h @@ -30,7 +30,7 @@ #define XLNX_ZDMA_H =20 #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "system/dma.h" #include "qom/object.h" =20 diff --git a/include/hw/dma/xlnx-zynq-devcfg.h b/include/hw/dma/xlnx-zynq-d= evcfg.h index e4cf085d703..8d10553c22a 100644 --- a/include/hw/dma/xlnx-zynq-devcfg.h +++ b/include/hw/dma/xlnx-zynq-devcfg.h @@ -27,7 +27,7 @@ #ifndef XLNX_ZYNQ_DEVCFG_H #define XLNX_ZYNQ_DEVCFG_H =20 -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/sysbus.h" #include "qom/object.h" =20 diff --git a/include/hw/dma/xlnx_csu_dma.h b/include/hw/dma/xlnx_csu_dma.h index 85b6b64e0e3..63af4586dd9 100644 --- a/include/hw/dma/xlnx_csu_dma.h +++ b/include/hw/dma/xlnx_csu_dma.h @@ -22,7 +22,7 @@ #define XLNX_CSU_DMA_H =20 #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/core/ptimer.h" #include "hw/stream.h" =20 diff --git a/include/hw/intc/xlnx-pmu-iomod-intc.h b/include/hw/intc/xlnx-p= mu-iomod-intc.h index ccc8bd272a2..e36b5e17629 100644 --- a/include/hw/intc/xlnx-pmu-iomod-intc.h +++ b/include/hw/intc/xlnx-pmu-iomod-intc.h @@ -26,7 +26,7 @@ #define HW_INTC_XLNX_PMU_IOMOD_INTC_H =20 #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qom/object.h" =20 #define TYPE_XLNX_PMU_IO_INTC "xlnx.pmu_io_intc" diff --git a/include/hw/intc/xlnx-zynqmp-ipi.h b/include/hw/intc/xlnx-zynqm= p-ipi.h index 33eff1d4f68..53fc89084af 100644 --- a/include/hw/intc/xlnx-zynqmp-ipi.h +++ b/include/hw/intc/xlnx-zynqmp-ipi.h @@ -26,7 +26,7 @@ #define XLNX_ZYNQMP_IPI_H =20 #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qom/object.h" =20 #define TYPE_XLNX_ZYNQMP_IPI "xlnx.zynqmp_ipi" diff --git a/include/hw/misc/allwinner-a10-dramc.h b/include/hw/misc/allwin= ner-a10-dramc.h index b61fbecbe74..a1ae621e217 100644 --- a/include/hw/misc/allwinner-a10-dramc.h +++ b/include/hw/misc/allwinner-a10-dramc.h @@ -25,7 +25,7 @@ =20 #include "qom/object.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" =20 /** * @name Constants diff --git a/include/hw/misc/xlnx-versal-cframe-reg.h b/include/hw/misc/xln= x-versal-cframe-reg.h index 83f6a077446..fe8788a7453 100644 --- a/include/hw/misc/xlnx-versal-cframe-reg.h +++ b/include/hw/misc/xlnx-versal-cframe-reg.h @@ -18,7 +18,7 @@ #define HW_MISC_XLNX_VERSAL_CFRAME_REG_H =20 #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/misc/xlnx-cfi-if.h" #include "hw/misc/xlnx-versal-cfu.h" #include "qemu/fifo32.h" diff --git a/include/hw/misc/xlnx-versal-cfu.h b/include/hw/misc/xlnx-versa= l-cfu.h index 3de3ee49231..3d7ca506de1 100644 --- a/include/hw/misc/xlnx-versal-cfu.h +++ b/include/hw/misc/xlnx-versal-cfu.h @@ -18,7 +18,7 @@ #define HW_MISC_XLNX_VERSAL_CFU_APB_H =20 #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/misc/xlnx-cfi-if.h" #include "qemu/fifo32.h" =20 diff --git a/include/hw/misc/xlnx-versal-crl.h b/include/hw/misc/xlnx-versa= l-crl.h index 49ed500acde..ace3d198bde 100644 --- a/include/hw/misc/xlnx-versal-crl.h +++ b/include/hw/misc/xlnx-versal-crl.h @@ -11,7 +11,7 @@ #define HW_MISC_XLNX_VERSAL_CRL_H =20 #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "target/arm/cpu-qom.h" #include "hw/arm/xlnx-versal-version.h" =20 diff --git a/include/hw/misc/xlnx-versal-pmc-iou-slcr.h b/include/hw/misc/x= lnx-versal-pmc-iou-slcr.h index 0c4a4fd66d9..d8f45bd94b2 100644 --- a/include/hw/misc/xlnx-versal-pmc-iou-slcr.h +++ b/include/hw/misc/xlnx-versal-pmc-iou-slcr.h @@ -55,7 +55,7 @@ #define XLNX_VERSAL_PMC_IOU_SLCR_H =20 #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" =20 #define TYPE_XILINX_VERSAL_PMC_IOU_SLCR "xlnx.versal-pmc-iou-slcr" =20 diff --git a/include/hw/misc/xlnx-versal-trng.h b/include/hw/misc/xlnx-vers= al-trng.h index 4e516216dbe..8de29104048 100644 --- a/include/hw/misc/xlnx-versal-trng.h +++ b/include/hw/misc/xlnx-versal-trng.h @@ -28,7 +28,7 @@ =20 #include "hw/core/irq.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" =20 #define TYPE_XLNX_VERSAL_TRNG "xlnx.versal-trng" OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalTRng, XLNX_VERSAL_TRNG); diff --git a/include/hw/misc/xlnx-versal-xramc.h b/include/hw/misc/xlnx-ver= sal-xramc.h index 35e4e8b91dd..e79941d8865 100644 --- a/include/hw/misc/xlnx-versal-xramc.h +++ b/include/hw/misc/xlnx-versal-xramc.h @@ -10,7 +10,7 @@ #define XLNX_VERSAL_XRAMC_H =20 #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" =20 #define TYPE_XLNX_XRAM_CTRL "xlnx.versal-xramc" =20 diff --git a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h b/include/hw/misc/xlnx-= zynqmp-apu-ctrl.h index fbfe34aa7e5..c0315720053 100644 --- a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h +++ b/include/hw/misc/xlnx-zynqmp-apu-ctrl.h @@ -12,7 +12,7 @@ #define HW_MISC_XLNX_ZYNQMP_APU_CTRL_H =20 #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "target/arm/cpu-qom.h" =20 #define TYPE_XLNX_ZYNQMP_APU_CTRL "xlnx.apu-ctrl" diff --git a/include/hw/misc/xlnx-zynqmp-crf.h b/include/hw/misc/xlnx-zynqm= p-crf.h index c746ae10397..df83034a988 100644 --- a/include/hw/misc/xlnx-zynqmp-crf.h +++ b/include/hw/misc/xlnx-zynqmp-crf.h @@ -9,7 +9,7 @@ #define HW_MISC_XLNX_ZYNQMP_CRF_H =20 #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" =20 #define TYPE_XLNX_ZYNQMP_CRF "xlnx.zynqmp_crf" OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPCRF, XLNX_ZYNQMP_CRF) diff --git a/include/hw/net/xlnx-versal-canfd.h b/include/hw/net/xlnx-versa= l-canfd.h index 45cf0001c6b..7cadf3123b5 100644 --- a/include/hw/net/xlnx-versal-canfd.h +++ b/include/hw/net/xlnx-versal-canfd.h @@ -28,7 +28,7 @@ #ifndef HW_CANFD_XILINX_H #define HW_CANFD_XILINX_H =20 -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/core/ptimer.h" #include "net/can_emu.h" #include "hw/core/qdev-clock.h" diff --git a/include/hw/net/xlnx-zynqmp-can.h b/include/hw/net/xlnx-zynqmp-= can.h index d272f40ea80..d23c1523caf 100644 --- a/include/hw/net/xlnx-zynqmp-can.h +++ b/include/hw/net/xlnx-zynqmp-can.h @@ -31,7 +31,7 @@ #define XLNX_ZYNQMP_CAN_H =20 #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "net/can_emu.h" #include "net/can_host.h" #include "qemu/fifo32.h" diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h index 63558dbc329..27423035d40 100644 --- a/include/hw/nvram/xlnx-bbram.h +++ b/include/hw/nvram/xlnx-bbram.h @@ -30,7 +30,7 @@ #include "hw/core/qdev.h" #include "hw/core/irq.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" =20 #define RMAX_XLNX_BBRAM ((0x4c / 4) + 1) =20 diff --git a/include/hw/nvram/xlnx-versal-efuse.h b/include/hw/nvram/xlnx-v= ersal-efuse.h index 37d09da4809..07f1000a851 100644 --- a/include/hw/nvram/xlnx-versal-efuse.h +++ b/include/hw/nvram/xlnx-versal-efuse.h @@ -24,7 +24,7 @@ =20 #include "hw/core/irq.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/nvram/xlnx-efuse.h" =20 #define XLNX_VERSAL_EFUSE_CTRL_R_MAX ((0x100 / 4) + 1) diff --git a/include/hw/nvram/xlnx-zynqmp-efuse.h b/include/hw/nvram/xlnx-z= ynqmp-efuse.h index 6eb3fea8fa2..d4886943860 100644 --- a/include/hw/nvram/xlnx-zynqmp-efuse.h +++ b/include/hw/nvram/xlnx-zynqmp-efuse.h @@ -24,7 +24,7 @@ =20 #include "hw/core/irq.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/nvram/xlnx-efuse.h" =20 #define XLNX_ZYNQMP_EFUSE_R_MAX ((0x10fc / 4) + 1) diff --git a/include/hw/pci/pcie_doe.h b/include/hw/pci/pcie_doe.h index 9e1275db8ae..4bd49bb5ae6 100644 --- a/include/hw/pci/pcie_doe.h +++ b/include/hw/pci/pcie_doe.h @@ -11,7 +11,7 @@ #define PCIE_DOE_H =20 #include "qemu/range.h" -#include "hw/register.h" +#include "hw/core/register.h" =20 /* * Reference: diff --git a/include/hw/rtc/xlnx-zynqmp-rtc.h b/include/hw/rtc/xlnx-zynqmp-= rtc.h index f0c6a2d78a8..a542b87cb89 100644 --- a/include/hw/rtc/xlnx-zynqmp-rtc.h +++ b/include/hw/rtc/xlnx-zynqmp-rtc.h @@ -27,7 +27,7 @@ #ifndef HW_RTC_XLNX_ZYNQMP_RTC_H #define HW_RTC_XLNX_ZYNQMP_RTC_H =20 -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/sysbus.h" #include "qom/object.h" =20 diff --git a/include/hw/ssi/xlnx-versal-ospi.h b/include/hw/ssi/xlnx-versal= -ospi.h index 4ac975aa2fd..e8709208caa 100644 --- a/include/hw/ssi/xlnx-versal-ospi.h +++ b/include/hw/ssi/xlnx-versal-ospi.h @@ -52,7 +52,7 @@ #ifndef XLNX_VERSAL_OSPI_H #define XLNX_VERSAL_OSPI_H =20 -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/ssi/ssi.h" #include "qemu/fifo8.h" #include "hw/dma/xlnx_csu_dma.h" diff --git a/include/hw/usb/hcd-dwc3.h b/include/hw/usb/hcd-dwc3.h index dbdf12b21d7..e656532d6c0 100644 --- a/include/hw/usb/hcd-dwc3.h +++ b/include/hw/usb/hcd-dwc3.h @@ -26,7 +26,7 @@ #ifndef HCD_DWC3_H #define HCD_DWC3_H =20 -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/usb/hcd-xhci.h" #include "hw/usb/hcd-xhci-sysbus.h" =20 diff --git a/include/hw/usb/xlnx-usb-subsystem.h b/include/hw/usb/xlnx-usb-= subsystem.h index 40f9e97e093..b22e5d065be 100644 --- a/include/hw/usb/xlnx-usb-subsystem.h +++ b/include/hw/usb/xlnx-usb-subsystem.h @@ -25,7 +25,7 @@ #ifndef XLNX_USB_SUBSYSTEM_H #define XLNX_USB_SUBSYSTEM_H =20 -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/sysbus.h" #include "hw/usb/xlnx-versal-usb2-ctrl-regs.h" #include "hw/usb/hcd-dwc3.h" diff --git a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h b/include/hw/usb/x= lnx-versal-usb2-ctrl-regs.h index 6a502006b07..c1470da4758 100644 --- a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h +++ b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h @@ -26,7 +26,7 @@ #ifndef XLNX_VERSAL_USB2_CTRL_REGS_H #define XLNX_VERSAL_USB2_CTRL_REGS_H =20 -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/sysbus.h" =20 #define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs" diff --git a/hw/core/register.c b/hw/core/register.c index 81316d48597..c3f3c936e70 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -16,7 +16,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qemu/log.h" #include "qemu/module.h" =20 diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c index 650401614ed..ffe258cf31a 100644 --- a/hw/dma/xlnx_csu_dma.c +++ b/hw/dma/xlnx_csu_dma.c @@ -28,7 +28,7 @@ #include "system/dma.h" #include "hw/core/ptimer.h" #include "hw/stream.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/dma/xlnx_csu_dma.h" =20 /* diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c index f3509efa0ab..b8bafe2f3f3 100644 --- a/hw/intc/xlnx-pmu-iomod-intc.c +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/xlnx-zynqmp-ipi.c b/hw/intc/xlnx-zynqmp-ipi.c index 99566bc2e20..e69ea74ff74 100644 --- a/hw/intc/xlnx-zynqmp-ipi.c +++ b/hw/intc/xlnx-zynqmp-ipi.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-= reg.c index a5a5e41f3e3..efacbe83abb 100644 --- a/hw/misc/xlnx-versal-cframe-reg.c +++ b/hw/misc/xlnx-versal-cframe-reg.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/core/registerfields.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c index 13cd597da49..bdce0ce7475 100644 --- a/hw/misc/xlnx-versal-cfu.c +++ b/hw/misc/xlnx-versal-cfu.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/core/irq.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c index b0baabc1adf..072d6d98591 100644 --- a/hw/misc/xlnx-versal-crl.c +++ b/hw/misc/xlnx-versal-crl.c @@ -12,7 +12,7 @@ #include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/resettable.h" =20 #include "target/arm/arm-powerctl.h" diff --git a/hw/misc/xlnx-versal-pmc-iou-slcr.c b/hw/misc/xlnx-versal-pmc-i= ou-slcr.c index 84d474c38fc..0246167a5e6 100644 --- a/hw/misc/xlnx-versal-pmc-iou-slcr.c +++ b/hw/misc/xlnx-versal-pmc-iou-slcr.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/core/irq.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/misc/xlnx-versal-xramc.c b/hw/misc/xlnx-versal-xramc.c index 6a86f6b5d48..f4f02c7680b 100644 --- a/hw/misc/xlnx-versal-xramc.c +++ b/hw/misc/xlnx-versal-xramc.c @@ -11,7 +11,7 @@ #include "qapi/error.h" #include "migration/vmstate.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/core/qdev-properties.h" #include "hw/core/irq.h" #include "hw/misc/xlnx-versal-xramc.h" diff --git a/hw/misc/xlnx-zynqmp-apu-ctrl.c b/hw/misc/xlnx-zynqmp-apu-ctrl.c index 93f0bedc48e..957043f01b9 100644 --- a/hw/misc/xlnx-zynqmp-apu-ctrl.c +++ b/hw/misc/xlnx-zynqmp-apu-ctrl.c @@ -15,7 +15,7 @@ #include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/register.h" +#include "hw/core/register.h" =20 #include "qemu/bitops.h" =20 diff --git a/hw/misc/xlnx-zynqmp-crf.c b/hw/misc/xlnx-zynqmp-crf.c index 841bce2231c..a2ebf6ce5d7 100644 --- a/hw/misc/xlnx-zynqmp-crf.c +++ b/hw/misc/xlnx-zynqmp-crf.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "migration/vmstate.h" diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 94d9178a540..3ceb1a8b912 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -33,7 +33,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qapi/error.h" #include "qemu/log.h" #include "hw/core/qdev-properties.h" diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c index 533ac854a2f..6c583cab8f5 100644 --- a/hw/net/can/xlnx-zynqmp-can.c +++ b/hw/net/can/xlnx-zynqmp-can.c @@ -31,7 +31,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "hw/core/irq.h" #include "qapi/error.h" #include "qemu/bitops.h" diff --git a/hw/rtc/ls7a_rtc.c b/hw/rtc/ls7a_rtc.c index 54943f60b80..b0c6588e098 100644 --- a/hw/rtc/ls7a_rtc.c +++ b/hw/rtc/ls7a_rtc.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qemu/timer.h" #include "system/system.h" #include "qemu/cutils.h" diff --git a/hw/rtc/xlnx-zynqmp-rtc.c b/hw/rtc/xlnx-zynqmp-rtc.c index 18849340d62..49d48dc6782 100644 --- a/hw/rtc/xlnx-zynqmp-rtc.c +++ b/hw/rtc/xlnx-zynqmp-rtc.c @@ -26,7 +26,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index e3c6035c169..a56a5e304dc 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -32,7 +32,7 @@ #include "qemu/bitops.h" #include "hw/ssi/xilinx_spips.h" #include "qapi/error.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "system/dma.h" #include "migration/blocker.h" #include "migration/vmstate.h" diff --git a/hw/usb/hcd-dwc3.c b/hw/usb/hcd-dwc3.c index 74dff39fda1..4018d70f02f 100644 --- a/hw/usb/hcd-dwc3.c +++ b/hw/usb/hcd-dwc3.c @@ -29,7 +29,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qemu/bitops.h" #include "qom/object.h" #include "migration/vmstate.h" diff --git a/hw/usb/xlnx-usb-subsystem.c b/hw/usb/xlnx-usb-subsystem.c index 7193dd4cd2c..e0dfdfdcbd1 100644 --- a/hw/usb/xlnx-usb-subsystem.c +++ b/hw/usb/xlnx-usb-subsystem.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qemu/bitops.h" #include "qom/object.h" #include "qapi/error.h" diff --git a/hw/usb/xlnx-versal-usb2-ctrl-regs.c b/hw/usb/xlnx-versal-usb2-= ctrl-regs.c index eb946b5dbd9..33a7d7fbca0 100644 --- a/hw/usb/xlnx-versal-usb2-ctrl-regs.c +++ b/hw/usb/xlnx-versal-usb2-ctrl-regs.c @@ -30,7 +30,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/register.h" +#include "hw/core/register.h" #include "qemu/bitops.h" #include "qom/object.h" #include "migration/vmstate.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764249500; cv=none; d=zohomail.com; s=zohoarc; b=ejnA4DUdl0YJdf+ldYHvPzR+k5Y/jnqc+a5mjfsX9TbXW3yEZHcnTym6p8q90tVMSq38+EXdz3Oj2+u8xvhZuv+Fd6n8fEgLtmNYuWFFkBh/aVBdfNB4rcbC1M57YhyulK35C5sKfGPWeT1KY1CRPn41yrzMjgtjDCaWd/WN4OM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764249500; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=wpnrAdD3xbORyd8otri4oXizO/2tYcx3tnVtrMiGUzw=; b=bg8N6CPRy//Ma8uJWylbiP794NE6zdSB9KnFywLsfV49OrPb0yq/ZlZeexdh0jhcdGQ4+FP7IYXVMVWIejci7LYC2cDThGuW7WaDM3Lpwp23F+BmE/BXKU3fIUuU3dTn6m+FgMUsgaHkqsPSraYmDVS1rAvDlSPSL0ANkZ9TIF0= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176424950026825.302536409770937; Thu, 27 Nov 2025 05:18:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObsj-0004Ep-Jm; Thu, 27 Nov 2025 08:17:57 -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 1vObr4-0002ju-KY for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vObqv-0001IK-7h for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:10 -0500 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553-W96hsvx7MR2T009z7sh86g-1; Thu, 27 Nov 2025 08:15:59 -0500 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-6411e349b73so976421a12.2 for ; Thu, 27 Nov 2025 05:15:59 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-64751051313sm1529185a12.28.2025.11.27.05.15.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wpnrAdD3xbORyd8otri4oXizO/2tYcx3tnVtrMiGUzw=; b=Mr+Z37+V8bMLXRyEczvskYDqwEnrdqakmINHzJE96SJ1AAuS7uWdngKU/oCZcNzr9AhuVU PXBzsrGlFo6NTLWfhO7K8qDndoOjIyx0bngB6BLv7q3RyF4kwYmvXCN5uKTUnRNlXzVB8K +7gkFEb8vdYHDAg98f2hthBx6lBQPtI= X-MC-Unique: W96hsvx7MR2T009z7sh86g-1 X-Mimecast-MFC-AGG-ID: W96hsvx7MR2T009z7sh86g_1764249359 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249357; x=1764854157; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wpnrAdD3xbORyd8otri4oXizO/2tYcx3tnVtrMiGUzw=; b=RwHfkrr1MEfStor6b/9vZjLlIPGb3hjTFy/YWiSEyUobW2uxUeBELj7HQJUUrMIQwl 6acyPpQHkOWwn8W3KH8VK+BmftWtFAXHwEgX9D9IE9tz8k1PYa8l+TSE8VmSH1qfyBwL zOCGcuapaASKGkF/u4MBiIhb5+fvcEEgtoMQPGGoBEhxzymD9f6KMEztbb7L19TNanho GdTRWBrCabP0pFpVFpxbZah9r23btEAci94mCLzFp3SH6cQ0+pgA5wyH7920OuMH1voP 4skds282GPgBfC/FB4X7SNJiqXEOQduA9YcSLrwooBMMw6EhMOatRGzvFc9VGo8H+jqR TbUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249357; x=1764854157; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=wpnrAdD3xbORyd8otri4oXizO/2tYcx3tnVtrMiGUzw=; b=AjyC7UOGk4LtHgrMMJZowmHDqaTODdcwzPeQFbn65HcWGbdn+VDHE076FXK9aDh43m vvX2XNUYfbMj8Br7d970UTi0D+wag5AzRZuTq9Y/cs9vKFu8LuX+YOm2p66cmJpwNyCb H2CyRr/Qt9PHJaqvWSXrlsaJdKGMOwmONHkv20j18PJs//f7kb7b15StLwGzwSNzaYJq I4eqEBK4odW4vjUu6SJKSWKh2EJ7iresbQhQH+At4wa9jDIq7i2BYvVagw1xbwRlWMbI x4VJ1dsfa3KE094X6s/j4FpoV6LgQ9KD5g6mw7pXErvlKLDY3vDoa6JxZ77BHdAsY3vQ 6i0A== X-Gm-Message-State: AOJu0Yzno+pxZorPiirYm0nxNVnu6QtBEJ+iuXZ4dXfpf4McFfGWUUl2 +U5xUO1IgpXQHeHoOvsGpZOtfirj9VVihF2a0VbzlExvEOgMu1g0nlllePgdn52yGunhoHT+4kW Pz4Rpdy9HuPw8Fb3h3Je8j2+hss/YpL1GvXpuqS8Zj4ZvyXrJ+d25ZSTn2CsrQnzENTr4P/An7n jbUgMR0wrTj2KTJqakWRZUVQEJiu0JCLqOvFQSp9ml X-Gm-Gg: ASbGncuKTaIOe4S7UI+/+NaF9Vlogm0XX3E0ogl+r9DFaRbQ/ckG2jvRKlP6B/wT3mC 7UrVeLIwvOkvYqQVJbvQu+5bXTX5d81Ae432yHU2DocZW8rt7uCoo3unkPSCzrlvjnNIPBPmpA3 vM1ATXhgvxtfn1J1egdal2FmQtDcu9ka/UPvT9G9wwqkTSFbc7KZKid2+K+zwGYgIkHKcoq/6M7 SxROlnSZP8y5QMm/f35j185X1A5mofIcCZcTK4tQRfYzZ9wqa3WJDBOg5ohnefdswtSqxJxemLf aSSjLUXFLSFREP6B3nZ/DxtOQ5GWjzV6k82/oxKrI7dJp0YUa6yrTWTaOPibK4Ar0zOP3/nfncD L7VEgm90TrNjt4jMOeoFvCK4wMFD3vuuDYOxT9qsSssK1PDIUxfWlWvD+PeNUXI2Kl4H8V0RtCR Rc9fONXGc2BfB7GeQ= X-Received: by 2002:a05:6402:51d0:b0:643:804a:fb5e with SMTP id 4fb4d7f45d1cf-64555cd9f23mr18359581a12.21.1764249357460; Thu, 27 Nov 2025 05:15:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IHtvP/aKYmrnE6TE/oxiPG4Vb8tq/H1pvd+sXdTz6EFwiIesJxKWOeZbT0wF3iJDkVZQ4e31A== X-Received: by 2002:a05:6402:51d0:b0:643:804a:fb5e with SMTP id 4fb4d7f45d1cf-64555cd9f23mr18359550a12.21.1764249356918; Thu, 27 Nov 2025 05:15:56 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 23/28] include: move hw/resettable.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:10 +0100 Message-ID: <20251127131516.80807-24-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764249509499019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- MAINTAINERS | 2 +- docs/devel/reset.rst | 2 +- include/hw/core/boards.h | 2 +- include/hw/core/qdev.h | 2 +- include/hw/{ =3D> core}/resettable.h | 0 include/hw/virtio/virtio-balloon.h | 2 +- include/hw/virtio/virtio-mem.h | 2 +- include/system/reset.h | 2 +- hw/core/reset.c | 2 +- hw/core/resetcontainer.c | 2 +- hw/core/resettable.c | 2 +- hw/misc/xlnx-versal-crl.c | 2 +- hw/net/lan9118_phy.c | 2 +- hw/pci-host/fsl_imx8m_phy.c | 2 +- hw/rtc/rs5c372.c | 2 +- system/runstate.c | 2 +- target/s390x/cpu.c | 2 +- 17 files changed, 16 insertions(+), 16 deletions(-) rename include/hw/{ =3D> core}/resettable.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index b9cc00a5582..e34c3e6dac2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3961,7 +3961,7 @@ F: docs/devel/clocks.rst Reset framework M: Peter Maydell S: Maintained -F: include/hw/resettable.h +F: include/hw/core/resettable.h F: include/hw/core/resetcontainer.h F: include/system/reset.h F: hw/core/reset.c diff --git a/docs/devel/reset.rst b/docs/devel/reset.rst index c02fe0a405c..91e8c21189e 100644 --- a/docs/devel/reset.rst +++ b/docs/devel/reset.rst @@ -4,7 +4,7 @@ Reset in QEMU: the Resettable interface =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The reset of qemu objects is handled using the resettable interface declar= ed -in ``include/hw/resettable.h``. +in ``include/hw/core/resettable.h``. =20 This interface allows objects to be grouped (on a tree basis); so that the whole group can be reset consistently. Each individual member object does = not diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index a48ed4f86a3..815845207b0 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -10,7 +10,7 @@ #include "qemu/module.h" #include "qom/object.h" #include "hw/core/cpu.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" =20 #define TYPE_MACHINE_SUFFIX "-machine" =20 diff --git a/include/hw/core/qdev.h b/include/hw/core/qdev.h index da93611d373..0b62580a0fb 100644 --- a/include/hw/core/qdev.h +++ b/include/hw/core/qdev.h @@ -9,7 +9,7 @@ #include "qom/object.h" #include "hw/core/hotplug.h" #include "hw/core/irq.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" =20 /** * DOC: The QEMU Device API diff --git a/include/hw/resettable.h b/include/hw/core/resettable.h similarity index 100% rename from include/hw/resettable.h rename to include/hw/core/resettable.h diff --git a/include/hw/virtio/virtio-balloon.h b/include/hw/virtio/virtio-= balloon.h index 0456c211c6e..79ac194ccec 100644 --- a/include/hw/virtio/virtio-balloon.h +++ b/include/hw/virtio/virtio-balloon.h @@ -16,7 +16,7 @@ #define QEMU_VIRTIO_BALLOON_H =20 #include "standard-headers/linux/virtio_balloon.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "hw/virtio/virtio.h" #include "system/iothread.h" #include "qom/object.h" diff --git a/include/hw/virtio/virtio-mem.h b/include/hw/virtio/virtio-mem.h index e0ab31b45a4..221cfd76bf9 100644 --- a/include/hw/virtio/virtio-mem.h +++ b/include/hw/virtio/virtio-mem.h @@ -14,7 +14,7 @@ #define HW_VIRTIO_MEM_H =20 #include "standard-headers/linux/virtio_mem.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "hw/virtio/virtio.h" #include "qapi/qapi-types-misc.h" #include "system/hostmem.h" diff --git a/include/system/reset.h b/include/system/reset.h index 97131d94cfc..62e9977e3c2 100644 --- a/include/system/reset.h +++ b/include/system/reset.h @@ -27,7 +27,7 @@ #ifndef QEMU_SYSTEM_RESET_H #define QEMU_SYSTEM_RESET_H =20 -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "qapi/qapi-events-run-state.h" =20 typedef void QEMUResetHandler(void *opaque); diff --git a/hw/core/reset.c b/hw/core/reset.c index 65f82fa43d9..e7230b49b70 100644 --- a/hw/core/reset.c +++ b/hw/core/reset.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "system/reset.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "hw/core/resetcontainer.h" =20 /* diff --git a/hw/core/resetcontainer.c b/hw/core/resetcontainer.c index 5ff17002e75..ef84aa2374a 100644 --- a/hw/core/resetcontainer.c +++ b/hw/core/resetcontainer.c @@ -15,7 +15,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "hw/core/resetcontainer.h" =20 struct ResettableContainer { diff --git a/hw/core/resettable.c b/hw/core/resettable.c index 5cdb4a4f8d3..86e16c8c6e4 100644 --- a/hw/core/resettable.c +++ b/hw/core/resettable.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "qemu/module.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "trace.h" =20 /** diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c index 072d6d98591..9bbf44def6b 100644 --- a/hw/misc/xlnx-versal-crl.c +++ b/hw/misc/xlnx-versal-crl.c @@ -13,7 +13,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/core/register.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" =20 #include "target/arm/arm-powerctl.h" #include "target/arm/multiprocessing.h" diff --git a/hw/net/lan9118_phy.c b/hw/net/lan9118_phy.c index f0f6e55d807..2fc027d112c 100644 --- a/hw/net/lan9118_phy.c +++ b/hw/net/lan9118_phy.c @@ -16,7 +16,7 @@ #include "hw/net/lan9118_phy.h" #include "hw/net/mii.h" #include "hw/core/irq.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/pci-host/fsl_imx8m_phy.c b/hw/pci-host/fsl_imx8m_phy.c index 04da3f99a07..0afa6167e0d 100644 --- a/hw/pci-host/fsl_imx8m_phy.c +++ b/hw/pci-host/fsl_imx8m_phy.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci-host/fsl_imx8m_phy.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "migration/vmstate.h" =20 #define CMN_REG075 0x1d4 diff --git a/hw/rtc/rs5c372.c b/hw/rtc/rs5c372.c index 58f12b836d3..20015dd6c1e 100644 --- a/hw/rtc/rs5c372.c +++ b/hw/rtc/rs5c372.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" #include "hw/core/qdev-properties.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "migration/vmstate.h" #include "qemu/bcd.h" #include "qom/object.h" diff --git a/system/runstate.c b/system/runstate.c index 89bbfe7fbf9..ed2db564806 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -32,7 +32,7 @@ #include "exec/cpu-common.h" #include "gdbstub/syscalls.h" #include "hw/core/boards.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "migration/misc.h" #include "migration/postcopy-ram.h" #include "monitor/monitor.h" diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index da536fb30ed..6c4198eb1b1 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -32,7 +32,7 @@ #include "system/hw_accel.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/resettable.h" +#include "hw/core/resettable.h" #include "fpu/softfloat-helpers.h" #include "disas/capstone.h" #include "system/tcg.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764255998; cv=none; d=zohomail.com; s=zohoarc; b=SP+0WwwCTNgKTEvXImSUXLcErrPb9MREeyhiRYusx2ZcxKPgYve2+6k3FLoM2l3BsbwCdTJ31eMZDBdGUQf0sy3IH/nQo/7W1m9iTRaTpnj8pQzExm0gVObo3lTkYUQYni+cLAvuKNyhDBWXm+giW7yHviPsfl3wzXtjKOEJkRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764255998; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=xgDAhhijifto90Oxu+cfsrCTAQGrn52zMBiEFLdoonA=; b=LPPFaFu2oyM6Kb5oLgeI2fNxs05QANL18vEGgUHZZHYvPd2WGHH7sy5YYD0AHkvmgW+B0IOIvb4axL4i4dwVx6ohAoduXmxTb4QaTnGbP6U4MDtrpCLX/NSd0PjIBH+idTIRrziqgkSbroTUj4ypu4aGJ5W6eJwOzYTfd8Xfffs= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764255998794154.34156176796853; Thu, 27 Nov 2025 07:06:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObrq-0003BS-IZ; Thu, 27 Nov 2025 08:17:04 -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 1vObr4-0002jw-Qs for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vObqy-0001IO-PY for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:10 -0500 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-263-78d88uXQO7yxPBGS0s2NyA-1; Thu, 27 Nov 2025 08:16:01 -0500 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-6411e349b73so976453a12.2 for ; Thu, 27 Nov 2025 05:16:01 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-64750a90d73sm1549460a12.13.2025.11.27.05.15.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:15:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xgDAhhijifto90Oxu+cfsrCTAQGrn52zMBiEFLdoonA=; b=RiB3SYwfkVP/OqFg7G7hZeh6kPNYnkpjh96ODbuviD0Vn7hKC4kQVbapAjtvtzmeGAjJWH IfmBi2aSM4k+KnyQe0nV273iR+tUL4J6JGE0hZYxaSDOexZECwt5Q+jJa3qaRc1WZZQgNo X6ekeDpK+WZ5QPpjbczxfF6T/meX0tU= X-MC-Unique: 78d88uXQO7yxPBGS0s2NyA-1 X-Mimecast-MFC-AGG-ID: 78d88uXQO7yxPBGS0s2NyA_1764249361 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249360; x=1764854160; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xgDAhhijifto90Oxu+cfsrCTAQGrn52zMBiEFLdoonA=; b=JI1g8vkiotvo5to1izkCJ/p5zRV5SNVzqHlMHFPlaHMMDMWGZnAi2fMIpjLNlzrKzk sojqa5RYfVrmJ61tU/OADyg41foMHLRJ9YgNz+zSf01gfxW5yqgxhFuakdCExRucjVwO EyUl+kfzs9TNOcCdltpyH1yLtpmeGAilszED8w7/ONrJiCFY8i5pkWBohZlJmXtzMY7F oWy7wpGbh7S9FoYnee3wNMMHANJtvXLNP6gbBYHKyLzP63WFLYUX5IcZKv1TSN4VQ8p4 XVR43WPmICvnTvZdD1TE1GvOO92mVX3U+Sk4H+VTG2wI3enbAhEQRgH0QnvjGeyvPwwH y95Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249360; x=1764854160; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=xgDAhhijifto90Oxu+cfsrCTAQGrn52zMBiEFLdoonA=; b=rEXaT+VCYKWyYkyo66p13BB9obz4KYOxUBGdSObLPqrMYZxUy5f42Htu9/yM7hvebI QmG0gsCkMEwjAisVCHKt2awieASTBUqvR9eyEJUVs49CfbKy2BEBANnV7v/aYlUYCpDT ALr4pidDMGwNnfTA8cUXV+5+7BQ5hLlZW7o8x3xypUr82W3WR7x+SQg9atWZdLkTL9hc EN/PslS0MSjtRqqhjMeoXdgTZVOsQLf0FT7MiN5JPnZauZXTCsyGuP8xBC3d6a0meAWB HWXUUYAE52xUzm+VoX4QIdi7BTwNljEoWETWFVrj02ILFPPNbtk7XLyxQ7FKglwvjT1y qgOw== X-Gm-Message-State: AOJu0YzE7rgU8tpY5LRbrhee5z5IRSB1KWId9TJDTHYZJ8wZVlt9ysId U38V/reyLwcSyZprL5Mr+4xLjs9ZJ81Dk2cXIkFtH4SguSEDNLTIcRT8z2mUNaP6x0RYlbJagnn 26rCwcqq6SM9UCoeVTXY2aDRQkhVm7ZytwVT7/G5wdP3t7mjkod0HzyOdADZ6zRpqusVS+E4zN6 5TGB2MABgBgdl9MmrjwXUSrldvUqJUIGj5fjEI9u4U X-Gm-Gg: ASbGnct3ULUrhl03OmLzwRJjT0OSlsKnXy+C5xRJvazLmTUhts5Y5tMI3vA3IYX+W3+ YxOd2Wui4CC1ILPKBye9J7cqFMn8QxtwLZBVDtuWkKzsgMCCQYfS7nm4ojr04AGDMaVpaK9Jpfc ZkhjArKUv+38lff3+n3iZvr9rZrNLbLkMvvFvx/+3AkHJsrwD9pz4wTri7QIUQAxOoh3WpS9BS9 Rs5BPp9m7foAuDkMyVu4f5Sa3MuDPLPNvCP0eGv80B6SLF1xw+2HOKd7N8MuzNFnTS4yV9t0szm y9mu6nvNQGH0rS6Bgpna9+VqaCvvfV7K72UVrl8SA6M/XQmx2lw+Z4cG/66ZBpyMkPlQeo0t25F zUH3DinqJGfofD4v2rIwtccY/PdJCdEXdlP/NEZNTURgRZ9bQ+1uQq6BiA51dmYybrPX/F9e7lr qE+OAV0esBObKqUcQ= X-Received: by 2002:a05:6402:2714:b0:641:3a92:7e6f with SMTP id 4fb4d7f45d1cf-645559fcb28mr20760812a12.0.1764249360131; Thu, 27 Nov 2025 05:16:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IG2ytSeuDOZSRwcw0SAST/YJR+190SVxILIQmAC47bve/p6q1HfaAtZXs2xqCYREErud09jkA== X-Received: by 2002:a05:6402:2714:b0:641:3a92:7e6f with SMTP id 4fb4d7f45d1cf-645559fcb28mr20760776a12.0.1764249359655; Thu, 27 Nov 2025 05:15:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 24/28] include: move hw/stream.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:11 +0100 Message-ID: <20251127131516.80807-25-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764256000043019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- MAINTAINERS | 2 +- include/hw/{ =3D> core}/stream.h | 0 include/hw/dma/xlnx_csu_dma.h | 2 +- include/hw/ssi/xilinx_spips.h | 2 +- hw/core/stream.c | 2 +- hw/dma/xilinx_axidma.c | 2 +- hw/dma/xlnx_csu_dma.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/net/xilinx_axienet.c | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename include/hw/{ =3D> core}/stream.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index e34c3e6dac2..72c70a46553 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3600,7 +3600,7 @@ Streams M: Edgar E. Iglesias S: Maintained F: hw/core/stream.c -F: include/hw/stream.h +F: include/hw/core/stream.h =20 Stubs M: Paolo Bonzini diff --git a/include/hw/stream.h b/include/hw/core/stream.h similarity index 100% rename from include/hw/stream.h rename to include/hw/core/stream.h diff --git a/include/hw/dma/xlnx_csu_dma.h b/include/hw/dma/xlnx_csu_dma.h index 63af4586dd9..4d6d18fb9b5 100644 --- a/include/hw/dma/xlnx_csu_dma.h +++ b/include/hw/dma/xlnx_csu_dma.h @@ -24,7 +24,7 @@ #include "hw/sysbus.h" #include "hw/core/register.h" #include "hw/core/ptimer.h" -#include "hw/stream.h" +#include "hw/core/stream.h" =20 #define TYPE_XLNX_CSU_DMA "xlnx.csu_dma" =20 diff --git a/include/hw/ssi/xilinx_spips.h b/include/hw/ssi/xilinx_spips.h index 7a754bf67a2..56cf69a37d2 100644 --- a/include/hw/ssi/xilinx_spips.h +++ b/include/hw/ssi/xilinx_spips.h @@ -27,7 +27,7 @@ =20 #include "hw/ssi/ssi.h" #include "qemu/fifo32.h" -#include "hw/stream.h" +#include "hw/core/stream.h" #include "hw/sysbus.h" #include "qom/object.h" =20 diff --git a/hw/core/stream.c b/hw/core/stream.c index 19477d0f2df..bfcac938802 100644 --- a/hw/core/stream.c +++ b/hw/core/stream.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "hw/stream.h" +#include "hw/core/stream.h" #include "qemu/module.h" =20 size_t diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 7cdd76330f3..90ba7bf0573 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -34,7 +34,7 @@ #include "qemu/module.h" =20 #include "system/dma.h" -#include "hw/stream.h" +#include "hw/core/stream.h" #include "qom/object.h" #include "trace.h" =20 diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c index ffe258cf31a..b390d092699 100644 --- a/hw/dma/xlnx_csu_dma.c +++ b/hw/dma/xlnx_csu_dma.c @@ -27,7 +27,7 @@ #include "migration/vmstate.h" #include "system/dma.h" #include "hw/core/ptimer.h" -#include "hw/stream.h" +#include "hw/core/stream.h" #include "hw/core/register.h" #include "hw/dma/xlnx_csu_dma.h" =20 diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_= ml605_mmu.c index 9c2b0ff0b37..51ee237d584 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -41,7 +41,7 @@ =20 #include "boot.h" =20 -#include "hw/stream.h" +#include "hw/core/stream.h" =20 #define LMB_BRAM_SIZE (128 * KiB) #define FLASH_SIZE (32 * MiB) diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 36047a51c00..451f8da2122 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -33,7 +33,7 @@ =20 #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/stream.h" +#include "hw/core/stream.h" #include "qom/object.h" =20 #define DPHY(x) --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764249498; cv=none; d=zohomail.com; s=zohoarc; b=H1Cq++HXVNVPsKSdv7pwnCCfrcbRF3vNPyUTk1hX/goSVlAPJhG6OGVi/83NAsA0Gh2QzVghpSsTk5H8KyYCCSKpcpkhp5zogLg4dbWv+r3qQAV2h2vi1vKVt6rBZWEhNk9WgE38XXTH4ZeiNXYkVxspA99vyQnAU31hAUrmNT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764249498; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=88bRV2EydA50jQjJcsdXKhyl30ziN5BACYW6xA0mepM=; b=SA3clqeIAZRy4zEuLim8D0XOnEcik3YrpY/hJWHe+aXAyF8Yo1ahbebwQqDQA9jWVHm50P1noBx5dj0hmWYB4N+O+owMuJffSF3sln7qqWM+FM4v/00WeIsxfUhjqkjRahFA0BjIfRYlkD8aHifaG+PGNpyF9Q3Gp9obI689pe4= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764249497981503.42118858395895; Thu, 27 Nov 2025 05:18:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObsm-0004dr-12; Thu, 27 Nov 2025 08:18:00 -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 1vObr9-0002nJ-1s for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:22 -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 1vObr4-0001JL-Cg for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:18 -0500 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-348-CWQGTTJ0M0a0qpe0J7O3ZA-1; Thu, 27 Nov 2025 08:16:06 -0500 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-640ed3ad89bso1446655a12.3 for ; Thu, 27 Nov 2025 05:16:06 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f59e8936sm156194266b.48.2025.11.27.05.16.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:16:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=88bRV2EydA50jQjJcsdXKhyl30ziN5BACYW6xA0mepM=; b=WKBUgJcWJaQRLHNTI3lMtlOh9X3V68XpGvoKnZMZHeasy+eFUZg5MfFktUCOZT7zdWEYWY uE3lLH69P7uPpppUKeLUoGOfwmiimcTPcmLWWinmv/8VqZBfw3dAntBBxHTGfYWP0+9MiP Cebc9nZXtBeJs/9ERekZXUh7UOYh+lk= X-MC-Unique: CWQGTTJ0M0a0qpe0J7O3ZA-1 X-Mimecast-MFC-AGG-ID: CWQGTTJ0M0a0qpe0J7O3ZA_1764249366 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249365; x=1764854165; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=88bRV2EydA50jQjJcsdXKhyl30ziN5BACYW6xA0mepM=; b=KGzR/yU9H9v4MP0h7NWXgkN8eXmKxttq4zjit8ZGBnuB+3OCpZUroG2SZRrfKveeg1 blz4cwbCK+jEEl2pWCvX6s6AmrYsJj3wAYeIKU0/5HtQaL67Go/TgQ56gntUrevYajiY pWWzIxJhpG42cNm4BxPKYoulfNwj2BxTCryFpnhNsWLm2DEzuCDdmYLtDkdxDw7HkNko iBpdgqgRIFY96Vik8iiAJpg0QMr4RxFMZxR753t1/aZMnGGd5RKkb0341b3KFm5RGorY EIPK13IlGPirbOy/SupBBfJGzz2bgvC0drW29UxmGG1W5Gd8hBu4VhrrZi+q6CzVtHoy K/3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249365; x=1764854165; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=88bRV2EydA50jQjJcsdXKhyl30ziN5BACYW6xA0mepM=; b=jYQGaGd75NYHhSA3XCEy/981TrV5XZZ7mXkzFJGHq4ycEBO2fBSpMfGyMrARvv/JDF YEwmUAnuz9x3b+Py1XM/wi7SaOu9pFSexrM9gR5eViywwccsk24PjoM2SGXgVQNTVwvk ioIy3TUYRXU4OYPH2WktdmYXyXXcJAU253Auw0DOzSGPhjGbQ1ecYd3NpkArDWym9B/o f/sxPRTi1NE5i42OTBaSdGF7/s2xiwdnNVL2kAJVxnH2CuEpP35JivUDlE2IM8JlMK4d U9+vSUwM0PE21ky3fpRcZ/HzyFZUDAqEGrCnwWhDNVrFjhIb283xR/wM0v9XtxZrvajQ 3Yrw== X-Gm-Message-State: AOJu0Ywye/mli7ZoRpWzFXUTNybQF6CT6LIyhoUlSth8N1FwGS5UAceW J43I6tAS0AYtpk/2/HOhibJXBnAvblfSbsOPRsUF6LJK/2rb4XUYxhcPDgLYtFu2XxlF2+3TFQ/ kzBTpjXi7JXH1LJQSb1r/pGQZh+0IQChW3fgVDX2aK4rVupuEbDc+L8SDIfEH8tMLQwFlGd80TR 5/ztMeMbXB3tzTS24DaeFjhYihuYvBXdMn9+eTMUMp X-Gm-Gg: ASbGnctTG1p3wksJR/hgNIyJfzYoH9RwdcUJKtL/aic2PJ4bSQs2zsyL/6yHwuJJuSq +AgCTpCloWPJsLytgs3yZyRgMrkIBrcoQ5g09ac7IsjkLJQfQ+H7DU/ugUv00xnAMyFWTL9CbSZ KI9cGv3RqYQc6IV5PXBULeYwU7sqgiaqDC+zcLdplZS82MKxeB40kybtuU6qBxnzIoI0Nmbhh6v P1KsG0Xe8QBTmpV7MrPGqWWV02EG+zulyWZWKrUB2cd+tRXZziO280qqI787fVoidRUNSEH3cTd BJx8BjGl2qeFfsJcLK/DTVUqJQGKMXq4sAe+iYHlaVIKGnuEg+qShoG1rzKXBBSFBevuE8JsPLE lfphvxG0EoQRAfi58J0RIIsZkSA5fn7x8wCuEyBucoIb8y4ogLTwa5sZw+eUPmNIOw1RD03k8rM MgRpJFiRs+x0xnsIw= X-Received: by 2002:a17:906:c105:b0:b76:ddc0:d87 with SMTP id a640c23a62f3a-b76ddc037eemr713378066b.2.1764249363525; Thu, 27 Nov 2025 05:16:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IEfOJ6oOtVSzs9DyugOdQ6nBR8AjOOaJEz30mt0hzaxr6Bsq2M29DW85lHSfl1LC37rPLqFFw== X-Received: by 2002:a17:906:c105:b0:b76:ddc0:d87 with SMTP id a640c23a62f3a-b76ddc037eemr713363566b.2.1764249361841; Thu, 27 Nov 2025 05:16:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 25/28] include: move hw/sysbus.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:12 +0100 Message-ID: <20251127131516.80807-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764249510322019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- hw/i386/kvm/xen_evtchn.h | 2 +- hw/intc/ioapic_internal.h | 2 +- hw/net/fsl_etsec/etsec.h | 2 +- hw/ppc/e500-ccsr.h | 2 +- hw/scsi/lasi_ncr710.h | 2 +- hw/scsi/ncr53c710.h | 2 +- hw/usb/hcd-dwc2.h | 2 +- hw/usb/hcd-ehci.h | 2 +- hw/usb/hcd-ohci.h | 2 +- hw/usb/hcd-xhci-sysbus.h | 2 +- include/hw/acpi/generic_event_device.h | 2 +- include/hw/adc/aspeed_adc.h | 2 +- include/hw/adc/npcm7xx_adc.h | 2 +- include/hw/adc/stm32f2xx_adc.h | 2 +- include/hw/adc/zynq-xadc.h | 2 +- include/hw/arm/armsse.h | 2 +- include/hw/arm/armv7m.h | 2 +- include/hw/arm/bcm2835_peripherals.h | 2 +- include/hw/arm/exynos4210.h | 2 +- include/hw/arm/fsl-imx8mp.h | 2 +- include/hw/arm/nrf51_soc.h | 2 +- include/hw/arm/smmu-common.h | 2 +- include/hw/arm/xlnx-versal.h | 2 +- include/hw/audio/asc.h | 2 +- include/hw/block/swim.h | 2 +- include/hw/char/avr_usart.h | 2 +- include/hw/char/bcm2835_aux.h | 2 +- include/hw/char/cadence_uart.h | 2 +- include/hw/char/cmsdk-apb-uart.h | 2 +- include/hw/char/digic-uart.h | 2 +- include/hw/char/escc.h | 2 +- include/hw/char/goldfish_tty.h | 2 +- include/hw/char/ibex_uart.h | 2 +- include/hw/char/imx_serial.h | 2 +- include/hw/char/max78000_uart.h | 2 +- include/hw/char/mchp_pfsoc_mmuart.h | 2 +- include/hw/char/nrf51_uart.h | 2 +- include/hw/char/pl011.h | 2 +- include/hw/char/renesas_sci.h | 2 +- include/hw/char/serial-mm.h | 2 +- include/hw/char/shakti_uart.h | 2 +- include/hw/char/sifive_uart.h | 2 +- include/hw/char/stm32f2xx_usart.h | 2 +- include/hw/char/stm32l4x5_usart.h | 2 +- include/hw/core/or-irq.h | 2 +- include/hw/core/platform-bus.h | 2 +- include/hw/core/split-irq.h | 2 +- include/hw/{ =3D> core}/sysbus.h | 0 include/hw/cpu/a15mpcore.h | 2 +- include/hw/cpu/a9mpcore.h | 2 +- include/hw/cpu/arm11mpcore.h | 2 +- include/hw/display/bcm2835_fb.h | 2 +- include/hw/display/macfb.h | 2 +- include/hw/display/xlnx_dp.h | 2 +- include/hw/dma/bcm2835_dma.h | 2 +- include/hw/dma/pl080.h | 2 +- include/hw/dma/sifive_pdma.h | 2 +- include/hw/dma/xlnx-zdma.h | 2 +- include/hw/dma/xlnx-zynq-devcfg.h | 2 +- include/hw/dma/xlnx_csu_dma.h | 2 +- include/hw/dma/xlnx_dpdma.h | 2 +- include/hw/fsi/aspeed_apb2opb.h | 2 +- include/hw/gpio/aspeed_gpio.h | 2 +- include/hw/gpio/bcm2835_gpio.h | 2 +- include/hw/gpio/bcm2838_gpio.h | 2 +- include/hw/gpio/imx_gpio.h | 2 +- include/hw/gpio/npcm7xx_gpio.h | 2 +- include/hw/gpio/nrf51_gpio.h | 2 +- include/hw/gpio/sifive_gpio.h | 2 +- include/hw/gpio/stm32l4x5_gpio.h | 2 +- include/hw/hyperv/vmbus-bridge.h | 2 +- include/hw/i2c/allwinner-i2c.h | 2 +- include/hw/i2c/arm_sbcon_i2c.h | 2 +- include/hw/i2c/aspeed_i2c.h | 2 +- include/hw/i2c/bcm2835_i2c.h | 2 +- include/hw/i2c/imx_i2c.h | 2 +- include/hw/i2c/microbit_i2c.h | 2 +- include/hw/i2c/npcm7xx_smbus.h | 2 +- include/hw/i2c/ppc4xx_i2c.h | 2 +- include/hw/i386/x86-iommu.h | 2 +- include/hw/ide/ahci-sysbus.h | 2 +- include/hw/input/i8042.h | 2 +- include/hw/input/lasips2.h | 2 +- include/hw/input/pl050.h | 2 +- include/hw/input/ps2.h | 2 +- include/hw/input/stellaris_gamepad.h | 2 +- include/hw/intc/allwinner-a10-pic.h | 2 +- include/hw/intc/arm_gic_common.h | 2 +- include/hw/intc/arm_gicv3_common.h | 2 +- include/hw/intc/arm_gicv3_its_common.h | 2 +- include/hw/intc/armv7m_nvic.h | 2 +- include/hw/intc/aspeed_intc.h | 2 +- include/hw/intc/aspeed_vic.h | 2 +- include/hw/intc/bcm2835_ic.h | 2 +- include/hw/intc/bcm2836_control.h | 2 +- include/hw/intc/exynos4210_combiner.h | 2 +- include/hw/intc/exynos4210_gic.h | 2 +- include/hw/intc/goldfish_pic.h | 2 +- include/hw/intc/grlib_irqmp.h | 2 +- include/hw/intc/heathrow_pic.h | 2 +- include/hw/intc/imx_avic.h | 2 +- include/hw/intc/imx_gpcv2.h | 2 +- include/hw/intc/loongarch_dintc.h | 2 +- include/hw/intc/loongarch_extioi_common.h | 2 +- include/hw/intc/loongarch_pch_msi.h | 2 +- include/hw/intc/loongarch_pic_common.h | 2 +- include/hw/intc/loongson_ipi.h | 2 +- include/hw/intc/loongson_ipi_common.h | 2 +- include/hw/intc/loongson_liointc.h | 2 +- include/hw/intc/m68k_irqc.h | 2 +- include/hw/intc/mips_gic.h | 2 +- include/hw/intc/realview_gic.h | 2 +- include/hw/intc/riscv_aclint.h | 2 +- include/hw/intc/riscv_aplic.h | 2 +- include/hw/intc/riscv_imsic.h | 2 +- include/hw/intc/rx_icu.h | 2 +- include/hw/intc/sifive_plic.h | 2 +- include/hw/intc/xlnx-pmu-iomod-intc.h | 2 +- include/hw/intc/xlnx-zynqmp-ipi.h | 2 +- include/hw/m68k/q800-glue.h | 2 +- include/hw/mem/npcm7xx_mc.h | 2 +- include/hw/mips/cps.h | 2 +- include/hw/misc/a9scu.h | 2 +- include/hw/misc/allwinner-a10-ccm.h | 2 +- include/hw/misc/allwinner-a10-dramc.h | 2 +- include/hw/misc/allwinner-cpucfg.h | 2 +- include/hw/misc/allwinner-h3-ccu.h | 2 +- include/hw/misc/allwinner-h3-dramc.h | 2 +- include/hw/misc/allwinner-h3-sysctrl.h | 2 +- include/hw/misc/allwinner-r40-ccu.h | 2 +- include/hw/misc/allwinner-r40-dramc.h | 2 +- include/hw/misc/allwinner-sid.h | 2 +- include/hw/misc/allwinner-sramc.h | 2 +- include/hw/misc/arm11scu.h | 2 +- include/hw/misc/armsse-cpu-pwrctrl.h | 2 +- include/hw/misc/armsse-cpuid.h | 2 +- include/hw/misc/armsse-mhu.h | 2 +- include/hw/misc/armv7m_ras.h | 2 +- include/hw/misc/aspeed_hace.h | 2 +- include/hw/misc/aspeed_i3c.h | 2 +- include/hw/misc/aspeed_lpc.h | 2 +- include/hw/misc/aspeed_peci.h | 2 +- include/hw/misc/aspeed_sbc.h | 2 +- include/hw/misc/aspeed_scu.h | 2 +- include/hw/misc/aspeed_sdmc.h | 2 +- include/hw/misc/aspeed_sli.h | 2 +- include/hw/misc/aspeed_xdma.h | 2 +- include/hw/misc/avr_power.h | 2 +- include/hw/misc/bcm2835_cprman.h | 2 +- include/hw/misc/bcm2835_mbox.h | 2 +- include/hw/misc/bcm2835_mphi.h | 2 +- include/hw/misc/bcm2835_powermgt.h | 2 +- include/hw/misc/bcm2835_property.h | 2 +- include/hw/misc/bcm2835_rng.h | 2 +- include/hw/misc/bcm2835_thermal.h | 2 +- include/hw/misc/djmemc.h | 2 +- include/hw/misc/imx6_src.h | 2 +- include/hw/misc/imx7_gpr.h | 2 +- include/hw/misc/imx7_snvs.h | 2 +- include/hw/misc/imx7_src.h | 2 +- include/hw/misc/imx8mp_analog.h | 2 +- include/hw/misc/imx_ccm.h | 2 +- include/hw/misc/imx_rngc.h | 2 +- include/hw/misc/iotkit-secctl.h | 2 +- include/hw/misc/iotkit-sysctl.h | 2 +- include/hw/misc/iotkit-sysinfo.h | 2 +- include/hw/misc/ivshmem-flat.h | 2 +- include/hw/misc/lasi.h | 2 +- include/hw/misc/mac_via.h | 2 +- include/hw/misc/macio/gpio.h | 2 +- include/hw/misc/max78000_aes.h | 2 +- include/hw/misc/max78000_gcr.h | 2 +- include/hw/misc/max78000_icc.h | 2 +- include/hw/misc/max78000_trng.h | 2 +- include/hw/misc/mchp_pfsoc_dmc.h | 2 +- include/hw/misc/mchp_pfsoc_ioscb.h | 2 +- include/hw/misc/mchp_pfsoc_sysreg.h | 2 +- include/hw/misc/mips_cmgcr.h | 2 +- include/hw/misc/mips_cpc.h | 2 +- include/hw/misc/mips_itu.h | 2 +- include/hw/misc/mos6522.h | 2 +- include/hw/misc/mps2-fpgaio.h | 2 +- include/hw/misc/mps2-scc.h | 2 +- include/hw/misc/msf2-sysreg.h | 2 +- include/hw/misc/npcm7xx_mft.h | 2 +- include/hw/misc/npcm7xx_pwm.h | 2 +- include/hw/misc/npcm7xx_rng.h | 2 +- include/hw/misc/npcm_clk.h | 2 +- include/hw/misc/npcm_gcr.h | 2 +- include/hw/misc/nrf51_rng.h | 2 +- include/hw/misc/sifive_e_aon.h | 2 +- include/hw/misc/sifive_e_prci.h | 2 +- include/hw/misc/sifive_test.h | 2 +- include/hw/misc/sifive_u_otp.h | 2 +- include/hw/misc/sifive_u_prci.h | 2 +- include/hw/misc/stm32_rcc.h | 2 +- include/hw/misc/stm32f2xx_syscfg.h | 2 +- include/hw/misc/stm32f4xx_exti.h | 2 +- include/hw/misc/stm32f4xx_syscfg.h | 2 +- include/hw/misc/stm32l4x5_exti.h | 2 +- include/hw/misc/stm32l4x5_rcc.h | 2 +- include/hw/misc/stm32l4x5_syscfg.h | 2 +- include/hw/misc/tz-mpc.h | 2 +- include/hw/misc/tz-msc.h | 2 +- include/hw/misc/tz-ppc.h | 2 +- include/hw/misc/unimp.h | 2 +- include/hw/misc/virt_ctrl.h | 2 +- include/hw/misc/xlnx-versal-cframe-reg.h | 2 +- include/hw/misc/xlnx-versal-cfu.h | 2 +- include/hw/misc/xlnx-versal-crl.h | 2 +- include/hw/misc/xlnx-versal-pmc-iou-slcr.h | 2 +- include/hw/misc/xlnx-versal-trng.h | 2 +- include/hw/misc/xlnx-versal-xramc.h | 2 +- include/hw/misc/xlnx-zynqmp-apu-ctrl.h | 2 +- include/hw/misc/xlnx-zynqmp-crf.h | 2 +- include/hw/net/allwinner-sun8i-emac.h | 2 +- include/hw/net/allwinner_emac.h | 2 +- include/hw/net/cadence_gem.h | 2 +- include/hw/net/dp8393x.h | 2 +- include/hw/net/ftgmac100.h | 2 +- include/hw/net/imx_fec.h | 2 +- include/hw/net/lan9118_phy.h | 2 +- include/hw/net/lance.h | 2 +- include/hw/net/lasi_82596.h | 2 +- include/hw/net/msf2-emac.h | 2 +- include/hw/net/npcm7xx_emc.h | 2 +- include/hw/net/npcm_gmac.h | 2 +- include/hw/net/npcm_pcs.h | 2 +- include/hw/net/xlnx-zynqmp-can.h | 2 +- include/hw/nubus/nubus.h | 2 +- include/hw/nvram/bcm2835_otp.h | 2 +- include/hw/nvram/fw_cfg.h | 2 +- include/hw/nvram/mac_nvram.h | 2 +- include/hw/nvram/npcm7xx_otp.h | 2 +- include/hw/nvram/nrf51_nvm.h | 2 +- include/hw/nvram/xlnx-bbram.h | 2 +- include/hw/nvram/xlnx-versal-efuse.h | 2 +- include/hw/nvram/xlnx-zynqmp-efuse.h | 2 +- include/hw/pci-host/aspeed_pcie.h | 2 +- include/hw/pci-host/designware.h | 2 +- include/hw/pci-host/fsl_imx8m_phy.h | 2 +- include/hw/pci-host/gpex.h | 2 +- include/hw/pci-host/xilinx-pcie.h | 2 +- include/hw/pci/pci_host.h | 2 +- include/hw/ppc/mac_dbdma.h | 2 +- include/hw/ppc/openpic.h | 2 +- include/hw/ppc/pnv.h | 2 +- include/hw/ppc/pnv_chip.h | 2 +- include/hw/ppc/pnv_pnor.h | 2 +- include/hw/ppc/pnv_psi.h | 2 +- include/hw/ppc/ppc4xx.h | 2 +- include/hw/ppc/xive.h | 2 +- include/hw/ppc/xive2.h | 2 +- include/hw/riscv/numa.h | 2 +- include/hw/riscv/riscv_hart.h | 2 +- include/hw/riscv/spike.h | 2 +- include/hw/riscv/virt.h | 2 +- include/hw/rtc/allwinner-rtc.h | 2 +- include/hw/rtc/aspeed_rtc.h | 2 +- include/hw/rtc/goldfish_rtc.h | 2 +- include/hw/rtc/pl031.h | 2 +- include/hw/rtc/xlnx-zynqmp-rtc.h | 2 +- include/hw/s390x/3270-ccw.h | 2 +- include/hw/s390x/css-bridge.h | 2 +- include/hw/s390x/s390_flic.h | 2 +- include/hw/s390x/sclp.h | 2 +- include/hw/scsi/esp.h | 2 +- include/hw/sd/allwinner-sdhost.h | 2 +- include/hw/sd/bcm2835_sdhost.h | 2 +- include/hw/sd/sdhci.h | 2 +- include/hw/sparc/sparc32_dma.h | 2 +- include/hw/sparc/sun4m_iommu.h | 2 +- include/hw/sparc/sun4u_iommu.h | 2 +- include/hw/ssi/allwinner-a10-spi.h | 2 +- include/hw/ssi/aspeed_smc.h | 2 +- include/hw/ssi/bcm2835_spi.h | 2 +- include/hw/ssi/ibex_spi_host.h | 2 +- include/hw/ssi/imx_spi.h | 2 +- include/hw/ssi/mss-spi.h | 2 +- include/hw/ssi/npcm7xx_fiu.h | 2 +- include/hw/ssi/npcm_pspi.h | 2 +- include/hw/ssi/pl022.h | 2 +- include/hw/ssi/pnv_spi.h | 2 +- include/hw/ssi/sifive_spi.h | 2 +- include/hw/ssi/stm32f2xx_spi.h | 2 +- include/hw/ssi/xilinx_spips.h | 2 +- include/hw/timer/a9gtimer.h | 2 +- include/hw/timer/allwinner-a10-pit.h | 2 +- include/hw/timer/arm_mptimer.h | 2 +- include/hw/timer/armv7m_systick.h | 2 +- include/hw/timer/avr_timer16.h | 2 +- include/hw/timer/bcm2835_systmr.h | 2 +- include/hw/timer/cadence_ttc.h | 2 +- include/hw/timer/cmsdk-apb-dualtimer.h | 2 +- include/hw/timer/cmsdk-apb-timer.h | 2 +- include/hw/timer/digic-timer.h | 2 +- include/hw/timer/ibex_timer.h | 2 +- include/hw/timer/imx_epit.h | 2 +- include/hw/timer/imx_gpt.h | 2 +- include/hw/timer/mss-timer.h | 2 +- include/hw/timer/npcm7xx_timer.h | 2 +- include/hw/timer/nrf51_timer.h | 2 +- include/hw/timer/renesas_cmt.h | 2 +- include/hw/timer/renesas_tmr.h | 2 +- include/hw/timer/sifive_pwm.h | 2 +- include/hw/timer/sse-counter.h | 2 +- include/hw/timer/sse-timer.h | 2 +- include/hw/timer/stellaris-gptm.h | 2 +- include/hw/timer/stm32f2xx_timer.h | 2 +- include/hw/tricore/tc27x_soc.h | 2 +- include/hw/tricore/tricore_testdevice.h | 2 +- include/hw/usb/imx-usb-phy.h | 2 +- include/hw/usb/xlnx-usb-subsystem.h | 2 +- include/hw/usb/xlnx-versal-usb2-ctrl-regs.h | 2 +- include/hw/virtio/virtio-mmio.h | 2 +- include/hw/watchdog/allwinner-wdt.h | 2 +- include/hw/watchdog/cmsdk-apb-watchdog.h | 2 +- include/hw/watchdog/sbsa_gwdt.h | 2 +- include/hw/watchdog/wdt_aspeed.h | 2 +- include/hw/watchdog/wdt_imx2.h | 2 +- include/hw/xen/xen_pvdev.h | 2 +- rust/hw/core/wrapper.h | 2 +- hw/acpi/cxl.c | 2 +- hw/adc/stm32f2xx_adc.c | 2 +- hw/arm/allwinner-a10.c | 2 +- hw/arm/allwinner-h3.c | 2 +- hw/arm/allwinner-r40.c | 2 +- hw/arm/armsse.c | 2 +- hw/arm/armv7m.c | 2 +- hw/arm/bcm2836.c | 2 +- hw/arm/bcm2838.c | 2 +- hw/arm/collie.c | 2 +- hw/arm/exynos4210.c | 2 +- hw/arm/exynos4_boards.c | 2 +- hw/arm/highbank.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/musicpal.c | 2 +- hw/arm/nrf51_soc.c | 2 +- hw/arm/omap1.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/smmuv3.c | 2 +- hw/arm/stellaris.c | 2 +- hw/arm/strongarm.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 2 +- hw/arm/virt.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/xlnx-versal-virt.c | 2 +- hw/arm/xlnx-versal.c | 2 +- hw/audio/asc.c | 2 +- hw/audio/cs4231.c | 2 +- hw/audio/marvell_88w8618.c | 2 +- hw/audio/pl041.c | 2 +- hw/avr/atmega.c | 2 +- hw/block/fdc-sysbus.c | 2 +- hw/block/pflash_cfi01.c | 2 +- hw/block/pflash_cfi02.c | 2 +- hw/block/swim.c | 2 +- hw/char/cadence_uart.c | 2 +- hw/char/cmsdk-apb-uart.c | 2 +- hw/char/digic-uart.c | 2 +- hw/char/escc.c | 2 +- hw/char/exynos4210_uart.c | 2 +- hw/char/goldfish_tty.c | 2 +- hw/char/grlib_apbuart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/pl011.c | 2 +- hw/char/sh_serial.c | 2 +- hw/char/xilinx_uartlite.c | 2 +- hw/core/qdev.c | 2 +- hw/core/sysbus.c | 2 +- hw/display/artist.c | 2 +- hw/display/cg3.c | 2 +- hw/display/exynos4210_fimd.c | 2 +- hw/display/g364fb.c | 2 +- hw/display/jazz_led.c | 2 +- hw/display/macfb.c | 2 +- hw/display/pl110.c | 2 +- hw/display/sm501.c | 2 +- hw/display/tcx.c | 2 +- hw/display/vga-mmio.c | 2 +- hw/dma/pl080.c | 2 +- hw/dma/pl330.c | 2 +- hw/dma/rc4030.c | 2 +- hw/dma/sifive_pdma.c | 2 +- hw/dma/sparc32_dma.c | 2 +- hw/dma/xilinx_axidma.c | 2 +- hw/dma/xlnx_csu_dma.c | 2 +- hw/gpio/bcm2835_gpio.c | 2 +- hw/gpio/bcm2838_gpio.c | 2 +- hw/gpio/gpio_key.c | 2 +- hw/gpio/gpio_pwr.c | 2 +- hw/gpio/mpc8xxx.c | 2 +- hw/gpio/omap_gpio.c | 2 +- hw/gpio/pl061.c | 2 +- hw/gpio/zaurus.c | 2 +- hw/hyperv/vmbus.c | 2 +- hw/i2c/aspeed_i2c.c | 2 +- hw/i2c/bitbang_i2c.c | 2 +- hw/i2c/exynos4210_i2c.c | 2 +- hw/i2c/i2c_mux_pca954x.c | 2 +- hw/i2c/mpc_i2c.c | 2 +- hw/i2c/omap_i2c.c | 2 +- hw/i386/intel_iommu.c | 2 +- hw/i386/kvm/clock.c | 2 +- hw/i386/kvm/xen_evtchn.c | 2 +- hw/i386/kvm/xen_gnttab.c | 2 +- hw/i386/kvm/xen_overlay.c | 2 +- hw/i386/kvm/xen_primary_console.c | 2 +- hw/i386/kvm/xen_xenstore.c | 2 +- hw/i386/microvm-dt.c | 2 +- hw/i386/nitro_enclave.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/pc_sysfw.c | 2 +- hw/i386/vapic.c | 2 +- hw/i386/x86-iommu.c | 2 +- hw/ide/mmio.c | 2 +- hw/input/lasips2.c | 2 +- hw/input/pl050.c | 2 +- hw/input/ps2.c | 2 +- hw/intc/allwinner-a10-pic.c | 2 +- hw/intc/apic_common.c | 2 +- hw/intc/arm_gic.c | 2 +- hw/intc/arm_gicv2m.c | 2 +- hw/intc/armv7m_nvic.c | 2 +- hw/intc/exynos4210_combiner.c | 2 +- hw/intc/exynos4210_gic.c | 2 +- hw/intc/goldfish_pic.c | 2 +- hw/intc/grlib_irqmp.c | 2 +- hw/intc/ioapic_common.c | 2 +- hw/intc/loongarch_dintc.c | 2 +- hw/intc/loongarch_pch_msi.c | 2 +- hw/intc/loongson_ipi_common.c | 2 +- hw/intc/mips_gic.c | 2 +- hw/intc/omap_intc.c | 2 +- hw/intc/ompic.c | 2 +- hw/intc/openpic.c | 2 +- hw/intc/openpic_kvm.c | 2 +- hw/intc/pl190.c | 2 +- hw/intc/riscv_aclint.c | 2 +- hw/intc/riscv_aplic.c | 2 +- hw/intc/riscv_imsic.c | 2 +- hw/intc/s390_flic.c | 2 +- hw/intc/sifive_plic.c | 2 +- hw/intc/slavio_intctl.c | 2 +- hw/intc/xilinx_intc.c | 2 +- hw/intc/xlnx-pmu-iomod-intc.c | 2 +- hw/intc/xlnx-zynqmp-ipi.c | 2 +- hw/isa/isa-bus.c | 2 +- hw/m68k/mcf5206.c | 2 +- hw/m68k/mcf5208.c | 2 +- hw/m68k/mcf_intc.c | 2 +- hw/m68k/next-cube.c | 2 +- hw/m68k/next-kbd.c | 2 +- hw/m68k/q800.c | 2 +- hw/m68k/virt.c | 2 +- hw/mem/sparse-mem.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/mips/jazz.c | 2 +- hw/mips/malta.c | 2 +- hw/misc/allwinner-a10-ccm.c | 2 +- hw/misc/allwinner-a10-dramc.c | 2 +- hw/misc/allwinner-cpucfg.c | 2 +- hw/misc/allwinner-h3-ccu.c | 2 +- hw/misc/allwinner-h3-dramc.c | 2 +- hw/misc/allwinner-h3-sysctrl.c | 2 +- hw/misc/allwinner-r40-ccu.c | 2 +- hw/misc/allwinner-r40-dramc.c | 2 +- hw/misc/allwinner-sid.c | 2 +- hw/misc/allwinner-sramc.c | 2 +- hw/misc/arm_integrator_debug.c | 2 +- hw/misc/arm_l2x0.c | 2 +- hw/misc/arm_sysctl.c | 2 +- hw/misc/armsse-cpu-pwrctrl.c | 2 +- hw/misc/armsse-cpuid.c | 2 +- hw/misc/armsse-mhu.c | 2 +- hw/misc/eccmemctl.c | 2 +- hw/misc/empty_slot.c | 2 +- hw/misc/exynos4210_clk.c | 2 +- hw/misc/exynos4210_pmu.c | 2 +- hw/misc/exynos4210_rng.c | 2 +- hw/misc/grlib_ahb_apb_pnp.c | 2 +- hw/misc/iosb.c | 2 +- hw/misc/iotkit-secctl.c | 2 +- hw/misc/iotkit-sysctl.c | 2 +- hw/misc/iotkit-sysinfo.c | 2 +- hw/misc/ivshmem-flat.c | 2 +- hw/misc/mac_via.c | 2 +- hw/misc/mchp_pfsoc_dmc.c | 2 +- hw/misc/mchp_pfsoc_ioscb.c | 2 +- hw/misc/mchp_pfsoc_sysreg.c | 2 +- hw/misc/mips_cmgcr.c | 2 +- hw/misc/mips_cpc.c | 2 +- hw/misc/mps2-fpgaio.c | 2 +- hw/misc/mps2-scc.c | 2 +- hw/misc/pvpanic-mmio.c | 2 +- hw/misc/sbsa_ec.c | 2 +- hw/misc/sifive_e_prci.c | 2 +- hw/misc/sifive_test.c | 2 +- hw/misc/sifive_u_otp.c | 2 +- hw/misc/sifive_u_prci.c | 2 +- hw/misc/slavio_misc.c | 2 +- hw/misc/tz-mpc.c | 2 +- hw/misc/tz-msc.c | 2 +- hw/misc/tz-ppc.c | 2 +- hw/misc/unimp.c | 2 +- hw/misc/virt_ctrl.c | 2 +- hw/misc/xlnx-versal-cframe-reg.c | 2 +- hw/misc/xlnx-versal-cfu.c | 2 +- hw/misc/xlnx-versal-crl.c | 2 +- hw/misc/xlnx-versal-pmc-iou-slcr.c | 2 +- hw/misc/xlnx-versal-xramc.c | 2 +- hw/misc/xlnx-zynqmp-apu-ctrl.c | 2 +- hw/misc/xlnx-zynqmp-crf.c | 2 +- hw/misc/zynq_slcr.c | 2 +- hw/net/allwinner-sun8i-emac.c | 2 +- hw/net/allwinner_emac.c | 2 +- hw/net/can/xlnx-versal-canfd.c | 2 +- hw/net/can/xlnx-zynqmp-can.c | 2 +- hw/net/dp8393x.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/net/lan9118.c | 2 +- hw/net/lasi_i82596.c | 2 +- hw/net/mcf_fec.c | 2 +- hw/net/mv88w8618_eth.c | 2 +- hw/net/opencores_eth.c | 2 +- hw/net/smc91c111.c | 2 +- hw/net/stellaris_enet.c | 2 +- hw/net/xgmac.c | 2 +- hw/net/xilinx_axienet.c | 2 +- hw/net/xilinx_ethlite.c | 2 +- hw/nubus/mac-nubus-bridge.c | 2 +- hw/nubus/nubus-bridge.c | 2 +- hw/nvram/ds1225y.c | 2 +- hw/nvram/fw_cfg.c | 2 +- hw/openrisc/openrisc_sim.c | 2 +- hw/openrisc/virt.c | 2 +- hw/pci-bridge/cxl_root_port.c | 2 +- hw/pci-host/i440fx.c | 2 +- hw/pci-host/mv64361.c | 2 +- hw/pci-host/sabre.c | 2 +- hw/pci-host/sh_pci.c | 2 +- hw/pci-host/versatile.c | 2 +- hw/ppc/e500.c | 2 +- hw/ppc/e500plat.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mpc8544_guts.c | 2 +- hw/ppc/pegasos.c | 2 +- hw/ppc/pnv_xscom.c | 2 +- hw/ppc/ppc440_bamboo.c | 2 +- hw/ppc/ppce500_spin.c | 2 +- hw/ppc/sam460ex.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/ppc/spapr_vio.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/riscv/microblaze-v-generic.c | 2 +- hw/riscv/microchip_pfsoc.c | 2 +- hw/riscv/riscv-iommu-sys.c | 2 +- hw/riscv/riscv_hart.c | 2 +- hw/riscv/sifive_e.c | 2 +- hw/riscv/sifive_u.c | 2 +- hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 2 +- hw/rtc/allwinner-rtc.c | 2 +- hw/rtc/exynos4210_rtc.c | 2 +- hw/rtc/goldfish_rtc.c | 2 +- hw/rtc/ls7a_rtc.c | 2 +- hw/rtc/m48t59.c | 2 +- hw/rtc/pl031.c | 2 +- hw/rtc/sun4v-rtc.c | 2 +- hw/rtc/xlnx-zynqmp-rtc.c | 2 +- hw/rx/rx62n.c | 2 +- hw/s390x/ap-bridge.c | 2 +- hw/s390x/css-bridge.c | 2 +- hw/scsi/esp.c | 2 +- hw/scsi/lasi_ncr710.c | 2 +- hw/scsi/ncr53c710.c | 2 +- hw/sd/omap_mmc.c | 2 +- hw/sd/pl181.c | 2 +- hw/sh4/r2d.c | 2 +- hw/sh4/sh7750.c | 2 +- hw/sparc/sun4m.c | 2 +- hw/sparc/sun4m_iommu.c | 2 +- hw/sparc64/sun4u.c | 2 +- hw/sparc64/sun4u_iommu.c | 2 +- hw/ssi/aspeed_smc.c | 2 +- hw/ssi/pl022.c | 2 +- hw/ssi/sifive_spi.c | 2 +- hw/ssi/xilinx_spi.c | 2 +- hw/ssi/xilinx_spips.c | 2 +- hw/ssi/xlnx-versal-ospi.c | 2 +- hw/timer/allwinner-a10-pit.c | 2 +- hw/timer/arm_timer.c | 2 +- hw/timer/armv7m_systick.c | 2 +- hw/timer/aspeed_timer.c | 2 +- hw/timer/cadence_ttc.c | 2 +- hw/timer/cmsdk-apb-dualtimer.c | 2 +- hw/timer/cmsdk-apb-timer.c | 2 +- hw/timer/digic-timer.c | 2 +- hw/timer/exynos4210_mct.c | 2 +- hw/timer/exynos4210_pwm.c | 2 +- hw/timer/grlib_gptimer.c | 2 +- hw/timer/hpet.c | 2 +- hw/timer/pxa2xx_timer.c | 2 +- hw/timer/slavio_timer.c | 2 +- hw/timer/sse-counter.c | 2 +- hw/timer/sse-timer.c | 2 +- hw/timer/xilinx_timer.c | 2 +- hw/tpm/tpm_tis_i2c.c | 2 +- hw/tpm/tpm_tis_sysbus.c | 2 +- hw/tricore/tc27x_soc.c | 2 +- hw/tricore/tricore_testdevice.c | 2 +- hw/uefi/var-service-sysbus.c | 2 +- hw/usb/hcd-dwc3.c | 2 +- hw/usb/hcd-ohci-pci.c | 2 +- hw/usb/hcd-ohci-sysbus.c | 2 +- hw/usb/hcd-ohci.c | 2 +- hw/usb/xlnx-usb-subsystem.c | 2 +- hw/usb/xlnx-versal-usb2-ctrl-regs.c | 2 +- hw/virtio/virtio-mmio.c | 2 +- hw/vmapple/aes.c | 2 +- hw/vmapple/bdif.c | 2 +- hw/vmapple/cfg.c | 2 +- hw/vmapple/vmapple.c | 2 +- hw/watchdog/allwinner-wdt.c | 2 +- hw/watchdog/cmsdk-apb-watchdog.c | 2 +- hw/watchdog/wdt_aspeed.c | 2 +- hw/xen/xen-bus.c | 2 +- hw/xen/xen-legacy-backend.c | 2 +- hw/xtensa/xtfpga.c | 2 +- system/qdev-monitor.c | 2 +- hw/display/apple-gfx-mmio.m | 2 +- 633 files changed, 632 insertions(+), 632 deletions(-) rename include/hw/{ =3D> core}/sysbus.h (100%) diff --git a/hw/i386/kvm/xen_evtchn.h b/hw/i386/kvm/xen_evtchn.h index 0521ebc0922..8d339db5601 100644 --- a/hw/i386/kvm/xen_evtchn.h +++ b/hw/i386/kvm/xen_evtchn.h @@ -12,7 +12,7 @@ #ifndef QEMU_XEN_EVTCHN_H #define QEMU_XEN_EVTCHN_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 typedef uint32_t evtchn_port_t; =20 diff --git a/hw/intc/ioapic_internal.h b/hw/intc/ioapic_internal.h index 51205767f44..499b997d4b7 100644 --- a/hw/intc/ioapic_internal.h +++ b/hw/intc/ioapic_internal.h @@ -24,7 +24,7 @@ =20 #include "system/memory.h" #include "hw/intc/ioapic.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/notify.h" #include "qom/object.h" =20 diff --git a/hw/net/fsl_etsec/etsec.h b/hw/net/fsl_etsec/etsec.h index ca8ad5638a3..24e1344bf1e 100644 --- a/hw/net/fsl_etsec/etsec.h +++ b/hw/net/fsl_etsec/etsec.h @@ -25,7 +25,7 @@ #ifndef ETSEC_H #define ETSEC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "hw/core/ptimer.h" #include "qom/object.h" diff --git a/hw/ppc/e500-ccsr.h b/hw/ppc/e500-ccsr.h index 249c17be3b8..4de006b4434 100644 --- a/hw/ppc/e500-ccsr.h +++ b/hw/ppc/e500-ccsr.h @@ -1,7 +1,7 @@ #ifndef E500_CCSR_H #define E500_CCSR_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 struct PPCE500CCSRState { diff --git a/hw/scsi/lasi_ncr710.h b/hw/scsi/lasi_ncr710.h index 058718068e8..99be001fc3c 100644 --- a/hw/scsi/lasi_ncr710.h +++ b/hw/scsi/lasi_ncr710.h @@ -14,7 +14,7 @@ #ifndef HW_LASI_NCR710_H #define HW_LASI_NCR710_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/osdep.h" #include "exec/memattrs.h" #include "hw/scsi/scsi.h" diff --git a/hw/scsi/ncr53c710.h b/hw/scsi/ncr53c710.h index 9ae64a182d5..a8dc92f4ef8 100644 --- a/hw/scsi/ncr53c710.h +++ b/hw/scsi/ncr53c710.h @@ -16,7 +16,7 @@ #define HW_NCR53C710_H =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/scsi/scsi.h" #include "qemu/fifo8.h" #include "qom/object.h" diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h index a99409a654b..68877661ca0 100644 --- a/hw/usb/hcd-dwc2.h +++ b/hw/usb/hcd-dwc2.h @@ -21,7 +21,7 @@ =20 #include "qemu/timer.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/usb/usb.h" #include "system/dma.h" #include "qom/object.h" diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index c16717294d3..0ae8c06331a 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -22,7 +22,7 @@ #include "hw/usb/usb.h" #include "system/dma.h" #include "hw/pci/pci_device.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #ifndef EHCI_DEBUG #define EHCI_DEBUG 0 diff --git a/hw/usb/hcd-ohci.h b/hw/usb/hcd-ohci.h index 75e266de90b..243cd1f46ac 100644 --- a/hw/usb/hcd-ohci.h +++ b/hw/usb/hcd-ohci.h @@ -21,7 +21,7 @@ #ifndef HCD_OHCI_H #define HCD_OHCI_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/dma.h" #include "hw/usb/usb.h" #include "qom/object.h" diff --git a/hw/usb/hcd-xhci-sysbus.h b/hw/usb/hcd-xhci-sysbus.h index f8175470bab..0ce6b6d9896 100644 --- a/hw/usb/hcd-xhci-sysbus.h +++ b/hw/usb/hcd-xhci-sysbus.h @@ -13,7 +13,7 @@ =20 #include "hw/usb/usb.h" #include "hcd-xhci.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define XHCI_SYSBUS(obj) \ OBJECT_CHECK(XHCISysbusState, (obj), TYPE_XHCI_SYSBUS) diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/gener= ic_event_device.h index 130c014d3f0..7cbfb5fe7d7 100644 --- a/include/hw/acpi/generic_event_device.h +++ b/include/hw/acpi/generic_event_device.h @@ -59,7 +59,7 @@ #ifndef HW_ACPI_GENERIC_EVENT_DEVICE_H #define HW_ACPI_GENERIC_EVENT_DEVICE_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/ghes.h" #include "hw/acpi/cpu.h" diff --git a/include/hw/adc/aspeed_adc.h b/include/hw/adc/aspeed_adc.h index f502f197ac0..75c00b03255 100644 --- a/include/hw/adc/aspeed_adc.h +++ b/include/hw/adc/aspeed_adc.h @@ -11,7 +11,7 @@ #ifndef HW_ADC_ASPEED_ADC_H #define HW_ADC_ASPEED_ADC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_ASPEED_ADC "aspeed.adc" #define TYPE_ASPEED_2400_ADC TYPE_ASPEED_ADC "-ast2400" diff --git a/include/hw/adc/npcm7xx_adc.h b/include/hw/adc/npcm7xx_adc.h index 02dc1902fce..867e4c767c0 100644 --- a/include/hw/adc/npcm7xx_adc.h +++ b/include/hw/adc/npcm7xx_adc.h @@ -18,7 +18,7 @@ =20 #include "hw/core/clock.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" =20 #define NPCM7XX_ADC_NUM_INPUTS 8 diff --git a/include/hw/adc/stm32f2xx_adc.h b/include/hw/adc/stm32f2xx_adc.h index 42b48981f24..2af21f1852d 100644 --- a/include/hw/adc/stm32f2xx_adc.h +++ b/include/hw/adc/stm32f2xx_adc.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F2XX_ADC_H #define HW_STM32F2XX_ADC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define ADC_SR 0x00 diff --git a/include/hw/adc/zynq-xadc.h b/include/hw/adc/zynq-xadc.h index c10cc4c379c..9b4943681b8 100644 --- a/include/hw/adc/zynq-xadc.h +++ b/include/hw/adc/zynq-xadc.h @@ -15,7 +15,7 @@ #ifndef ZYNQ_XADC_H #define ZYNQ_XADC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define ZYNQ_XADC_MMIO_SIZE 0x0020 diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h index 414e553600d..bdf2d4db8e2 100644 --- a/include/hw/arm/armsse.h +++ b/include/hw/arm/armsse.h @@ -93,7 +93,7 @@ #ifndef ARMSSE_H #define ARMSSE_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/armv7m.h" #include "hw/misc/iotkit-secctl.h" #include "hw/misc/tz-ppc.h" diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h index e31888cc8cd..98ad08db036 100644 --- a/include/hw/arm/armv7m.h +++ b/include/hw/arm/armv7m.h @@ -10,7 +10,7 @@ #ifndef HW_ARM_ARMV7M_H #define HW_ARM_ARMV7M_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/armv7m_nvic.h" #include "hw/misc/armv7m_ras.h" #include "target/arm/idau.h" diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_= peripherals.h index d46d892956d..bf35bb18e54 100644 --- a/include/hw/arm/bcm2835_peripherals.h +++ b/include/hw/arm/bcm2835_peripherals.h @@ -12,7 +12,7 @@ #ifndef BCM2835_PERIPHERALS_H #define BCM2835_PERIPHERALS_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/char/pl011.h" #include "hw/char/bcm2835_aux.h" #include "hw/display/bcm2835_fb.h" diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h index fbe4370219d..b29e7243c72 100644 --- a/include/hw/arm/exynos4210.h +++ b/include/hw/arm/exynos4210.h @@ -25,7 +25,7 @@ #define EXYNOS4210_H =20 #include "hw/core/or-irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/cpu/a9mpcore.h" #include "hw/intc/exynos4210_gic.h" #include "hw/intc/exynos4210_combiner.h" diff --git a/include/hw/arm/fsl-imx8mp.h b/include/hw/arm/fsl-imx8mp.h index 1275df22f19..4b367b754c6 100644 --- a/include/hw/arm/fsl-imx8mp.h +++ b/include/hw/arm/fsl-imx8mp.h @@ -26,7 +26,7 @@ #include "hw/timer/imx_gpt.h" #include "hw/usb/hcd-dwc3.h" #include "hw/watchdog/wdt_imx2.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "qemu/units.h" =20 diff --git a/include/hw/arm/nrf51_soc.h b/include/hw/arm/nrf51_soc.h index 94d7fc62ac4..f759d007a13 100644 --- a/include/hw/arm/nrf51_soc.h +++ b/include/hw/arm/nrf51_soc.h @@ -10,7 +10,7 @@ #ifndef NRF51_SOC_H #define NRF51_SOC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/armv7m.h" #include "hw/char/nrf51_uart.h" #include "hw/misc/nrf51_rng.h" diff --git a/include/hw/arm/smmu-common.h b/include/hw/arm/smmu-common.h index 80d0fecfde8..48368c8e894 100644 --- a/include/hw/arm/smmu-common.h +++ b/include/hw/arm/smmu-common.h @@ -19,7 +19,7 @@ #ifndef HW_ARM_SMMU_COMMON_H #define HW_ARM_SMMU_COMMON_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci.h" #include "qom/object.h" =20 diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index e1fb1f4cf5b..4c4599add1d 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -13,7 +13,7 @@ #ifndef XLNX_VERSAL_H #define XLNX_VERSAL_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "net/can_emu.h" #include "hw/arm/xlnx-versal-version.h" diff --git a/include/hw/audio/asc.h b/include/hw/audio/asc.h index bb51e9a3d19..f4aefbfe5a5 100644 --- a/include/hw/audio/asc.h +++ b/include/hw/audio/asc.h @@ -13,7 +13,7 @@ #ifndef HW_AUDIO_ASC_H #define HW_AUDIO_ASC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/audio.h" =20 #define ASC_FREQ 22257 diff --git a/include/hw/block/swim.h b/include/hw/block/swim.h index 5f567e8d595..e8998f57c4b 100644 --- a/include/hw/block/swim.h +++ b/include/hw/block/swim.h @@ -12,7 +12,7 @@ #define SWIM_H =20 #include "hw/block/block.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define SWIM_MAX_FD 2 diff --git a/include/hw/char/avr_usart.h b/include/hw/char/avr_usart.h index bd2d488f9a1..8af7a5d1eec 100644 --- a/include/hw/char/avr_usart.h +++ b/include/hw/char/avr_usart.h @@ -22,7 +22,7 @@ #ifndef HW_CHAR_AVR_USART_H #define HW_CHAR_AVR_USART_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" =20 diff --git a/include/hw/char/bcm2835_aux.h b/include/hw/char/bcm2835_aux.h index a11134f216f..c5ce148bbce 100644 --- a/include/hw/char/bcm2835_aux.h +++ b/include/hw/char/bcm2835_aux.h @@ -9,7 +9,7 @@ #ifndef BCM2835_AUX_H #define BCM2835_AUX_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" =20 diff --git a/include/hw/char/cadence_uart.h b/include/hw/char/cadence_uart.h index ad09fbdf32c..751a751248f 100644 --- a/include/hw/char/cadence_uart.h +++ b/include/hw/char/cadence_uart.h @@ -20,7 +20,7 @@ #define CADENCE_UART_H =20 #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/include/hw/char/cmsdk-apb-uart.h b/include/hw/char/cmsdk-apb-u= art.h index 3d0af26cebc..0c62b7f2f50 100644 --- a/include/hw/char/cmsdk-apb-uart.h +++ b/include/hw/char/cmsdk-apb-uart.h @@ -12,7 +12,7 @@ #ifndef CMSDK_APB_UART_H #define CMSDK_APB_UART_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" =20 diff --git a/include/hw/char/digic-uart.h b/include/hw/char/digic-uart.h index 3eebdab8a01..6f67b70dfd5 100644 --- a/include/hw/char/digic-uart.h +++ b/include/hw/char/digic-uart.h @@ -18,7 +18,7 @@ #ifndef HW_CHAR_DIGIC_UART_H #define HW_CHAR_DIGIC_UART_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" =20 diff --git a/include/hw/char/escc.h b/include/hw/char/escc.h index 857f64699e3..9e60175b778 100644 --- a/include/hw/char/escc.h +++ b/include/hw/char/escc.h @@ -3,7 +3,7 @@ =20 #include "chardev/char-fe.h" #include "chardev/char-serial.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "ui/input.h" #include "qom/object.h" =20 diff --git a/include/hw/char/goldfish_tty.h b/include/hw/char/goldfish_tty.h index 70fdedd1d0f..a696362fa55 100644 --- a/include/hw/char/goldfish_tty.h +++ b/include/hw/char/goldfish_tty.h @@ -12,7 +12,7 @@ =20 #include "qemu/fifo8.h" #include "chardev/char-fe.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_GOLDFISH_TTY "goldfish_tty" OBJECT_DECLARE_SIMPLE_TYPE(GoldfishTTYState, GOLDFISH_TTY) diff --git a/include/hw/char/ibex_uart.h b/include/hw/char/ibex_uart.h index 1ccbb602e61..882796e0c64 100644 --- a/include/hw/char/ibex_uart.h +++ b/include/hw/char/ibex_uart.h @@ -25,7 +25,7 @@ #ifndef HW_IBEX_UART_H #define HW_IBEX_UART_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qemu/timer.h" #include "qom/object.h" diff --git a/include/hw/char/imx_serial.h b/include/hw/char/imx_serial.h index 2dcd2e6bcdd..855792b6055 100644 --- a/include/hw/char/imx_serial.h +++ b/include/hw/char/imx_serial.h @@ -18,7 +18,7 @@ #ifndef IMX_SERIAL_H #define IMX_SERIAL_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" #include "qemu/fifo32.h" diff --git a/include/hw/char/max78000_uart.h b/include/hw/char/max78000_uar= t.h index ac93f83389a..6977c7b3f16 100644 --- a/include/hw/char/max78000_uart.h +++ b/include/hw/char/max78000_uart.h @@ -9,7 +9,7 @@ #ifndef HW_MAX78000_UART_H #define HW_MAX78000_UART_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qemu/fifo8.h" #include "qom/object.h" diff --git a/include/hw/char/mchp_pfsoc_mmuart.h b/include/hw/char/mchp_pfs= oc_mmuart.h index a7b8b1b08b3..1e27732df12 100644 --- a/include/hw/char/mchp_pfsoc_mmuart.h +++ b/include/hw/char/mchp_pfsoc_mmuart.h @@ -28,7 +28,7 @@ #ifndef HW_MCHP_PFSOC_MMUART_H #define HW_MCHP_PFSOC_MMUART_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/char/serial-mm.h" =20 #define MCHP_PFSOC_MMUART_REG_COUNT 13 diff --git a/include/hw/char/nrf51_uart.h b/include/hw/char/nrf51_uart.h index 7a54db746bd..36a6c54cde1 100644 --- a/include/hw/char/nrf51_uart.h +++ b/include/hw/char/nrf51_uart.h @@ -11,7 +11,7 @@ #ifndef NRF51_UART_H #define NRF51_UART_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "hw/core/registerfields.h" #include "qom/object.h" diff --git a/include/hw/char/pl011.h b/include/hw/char/pl011.h index 2d4ff01c815..ff735b5234a 100644 --- a/include/hw/char/pl011.h +++ b/include/hw/char/pl011.h @@ -15,7 +15,7 @@ #ifndef HW_PL011_H #define HW_PL011_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" =20 diff --git a/include/hw/char/renesas_sci.h b/include/hw/char/renesas_sci.h index 90e784f36a3..372e788be4c 100644 --- a/include/hw/char/renesas_sci.h +++ b/include/hw/char/renesas_sci.h @@ -10,7 +10,7 @@ #define HW_CHAR_RENESAS_SCI_H =20 #include "chardev/char-fe.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_RENESAS_SCI "renesas-sci" diff --git a/include/hw/char/serial-mm.h b/include/hw/char/serial-mm.h index 77abd098e0d..0076bdc061b 100644 --- a/include/hw/char/serial-mm.h +++ b/include/hw/char/serial-mm.h @@ -29,7 +29,7 @@ #include "hw/char/serial.h" #include "system/memory.h" #include "chardev/char.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_SERIAL_MM "serial-mm" diff --git a/include/hw/char/shakti_uart.h b/include/hw/char/shakti_uart.h index e5e775d7c9a..e77553f2b57 100644 --- a/include/hw/char/shakti_uart.h +++ b/include/hw/char/shakti_uart.h @@ -25,7 +25,7 @@ #ifndef HW_SHAKTI_UART_H #define HW_SHAKTI_UART_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" =20 #define SHAKTI_UART_BAUD 0x00 diff --git a/include/hw/char/sifive_uart.h b/include/hw/char/sifive_uart.h index dea6055f872..414564b0266 100644 --- a/include/hw/char/sifive_uart.h +++ b/include/hw/char/sifive_uart.h @@ -22,7 +22,7 @@ =20 #include "chardev/char-fe.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "qemu/fifo8.h" =20 diff --git a/include/hw/char/stm32f2xx_usart.h b/include/hw/char/stm32f2xx_= usart.h index f9018b8b8f6..5bb5bb28c13 100644 --- a/include/hw/char/stm32f2xx_usart.h +++ b/include/hw/char/stm32f2xx_usart.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F2XX_USART_H #define HW_STM32F2XX_USART_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" =20 diff --git a/include/hw/char/stm32l4x5_usart.h b/include/hw/char/stm32l4x5_= usart.h index cdf7419f533..3bb59fd654b 100644 --- a/include/hw/char/stm32l4x5_usart.h +++ b/include/hw/char/stm32l4x5_usart.h @@ -18,7 +18,7 @@ #ifndef HW_STM32L4X5_USART_H #define HW_STM32L4X5_USART_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" =20 diff --git a/include/hw/core/or-irq.h b/include/hw/core/or-irq.h index c0a42f37112..1123cc518fb 100644 --- a/include/hw/core/or-irq.h +++ b/include/hw/core/or-irq.h @@ -25,7 +25,7 @@ #ifndef HW_OR_IRQ_H #define HW_OR_IRQ_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_OR_IRQ "or-irq" diff --git a/include/hw/core/platform-bus.h b/include/hw/core/platform-bus.h index 44f30c5353f..45b9d8dbc7b 100644 --- a/include/hw/core/platform-bus.h +++ b/include/hw/core/platform-bus.h @@ -22,7 +22,7 @@ * License along with this library; if not, see . */ =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 =20 diff --git a/include/hw/core/split-irq.h b/include/hw/core/split-irq.h index ff8852f4071..19e9830b763 100644 --- a/include/hw/core/split-irq.h +++ b/include/hw/core/split-irq.h @@ -35,7 +35,7 @@ #ifndef HW_SPLIT_IRQ_H #define HW_SPLIT_IRQ_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_SPLIT_IRQ "split-irq" diff --git a/include/hw/sysbus.h b/include/hw/core/sysbus.h similarity index 100% rename from include/hw/sysbus.h rename to include/hw/core/sysbus.h diff --git a/include/hw/cpu/a15mpcore.h b/include/hw/cpu/a15mpcore.h index 75d39e5458a..138f491c222 100644 --- a/include/hw/cpu/a15mpcore.h +++ b/include/hw/cpu/a15mpcore.h @@ -20,7 +20,7 @@ #ifndef HW_CPU_A15MPCORE_H #define HW_CPU_A15MPCORE_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/arm_gic.h" #include "qom/object.h" =20 diff --git a/include/hw/cpu/a9mpcore.h b/include/hw/cpu/a9mpcore.h index e0396ab6af7..60765990247 100644 --- a/include/hw/cpu/a9mpcore.h +++ b/include/hw/cpu/a9mpcore.h @@ -10,7 +10,7 @@ #ifndef HW_CPU_A9MPCORE_H #define HW_CPU_A9MPCORE_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/arm_gic.h" #include "hw/misc/a9scu.h" #include "hw/timer/arm_mptimer.h" diff --git a/include/hw/cpu/arm11mpcore.h b/include/hw/cpu/arm11mpcore.h index 2cac8c1232d..1a8fbc550a6 100644 --- a/include/hw/cpu/arm11mpcore.h +++ b/include/hw/cpu/arm11mpcore.h @@ -10,7 +10,7 @@ #ifndef HW_CPU_ARM11MPCORE_H #define HW_CPU_ARM11MPCORE_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/arm11scu.h" #include "hw/intc/arm_gic.h" #include "hw/timer/arm_mptimer.h" diff --git a/include/hw/display/bcm2835_fb.h b/include/hw/display/bcm2835_f= b.h index acc9230b6a8..f7ef076f1f4 100644 --- a/include/hw/display/bcm2835_fb.h +++ b/include/hw/display/bcm2835_fb.h @@ -12,7 +12,7 @@ #ifndef BCM2835_FB_H #define BCM2835_FB_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define UPPER_RAM_BASE 0x40000000 diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h index 356a03ce31a..495dead44b5 100644 --- a/include/hw/display/macfb.h +++ b/include/hw/display/macfb.h @@ -16,7 +16,7 @@ #include "system/memory.h" #include "hw/core/irq.h" #include "hw/nubus/nubus.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "ui/console.h" #include "qemu/timer.h" =20 diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h index 9ec5a90c342..b01c77fed69 100644 --- a/include/hw/display/xlnx_dp.h +++ b/include/hw/display/xlnx_dp.h @@ -24,7 +24,7 @@ #ifndef XLNX_DP_H #define XLNX_DP_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "ui/console.h" #include "hw/misc/auxbus.h" #include "hw/i2c/i2c.h" diff --git a/include/hw/dma/bcm2835_dma.h b/include/hw/dma/bcm2835_dma.h index 1d26b1d8d0f..9c20652d4e4 100644 --- a/include/hw/dma/bcm2835_dma.h +++ b/include/hw/dma/bcm2835_dma.h @@ -8,7 +8,7 @@ #ifndef BCM2835_DMA_H #define BCM2835_DMA_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 typedef struct { diff --git a/include/hw/dma/pl080.h b/include/hw/dma/pl080.h index 3c9659e4381..6635cd8e93d 100644 --- a/include/hw/dma/pl080.h +++ b/include/hw/dma/pl080.h @@ -29,7 +29,7 @@ #ifndef HW_DMA_PL080_H #define HW_DMA_PL080_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define PL080_MAX_CHANNELS 8 diff --git a/include/hw/dma/sifive_pdma.h b/include/hw/dma/sifive_pdma.h index 8c6cfa7f325..34494ec6014 100644 --- a/include/hw/dma/sifive_pdma.h +++ b/include/hw/dma/sifive_pdma.h @@ -23,7 +23,7 @@ #ifndef SIFIVE_PDMA_H #define SIFIVE_PDMA_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 struct sifive_pdma_chan { uint32_t control; diff --git a/include/hw/dma/xlnx-zdma.h b/include/hw/dma/xlnx-zdma.h index 2d2d4aeefab..7d254c66e7d 100644 --- a/include/hw/dma/xlnx-zdma.h +++ b/include/hw/dma/xlnx-zdma.h @@ -29,7 +29,7 @@ #ifndef XLNX_ZDMA_H #define XLNX_ZDMA_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "system/dma.h" #include "qom/object.h" diff --git a/include/hw/dma/xlnx-zynq-devcfg.h b/include/hw/dma/xlnx-zynq-d= evcfg.h index 8d10553c22a..3e3cc7b98ba 100644 --- a/include/hw/dma/xlnx-zynq-devcfg.h +++ b/include/hw/dma/xlnx-zynq-devcfg.h @@ -28,7 +28,7 @@ #define XLNX_ZYNQ_DEVCFG_H =20 #include "hw/core/register.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_XLNX_ZYNQ_DEVCFG "xlnx.ps7-dev-cfg" diff --git a/include/hw/dma/xlnx_csu_dma.h b/include/hw/dma/xlnx_csu_dma.h index 4d6d18fb9b5..ceb28f40bae 100644 --- a/include/hw/dma/xlnx_csu_dma.h +++ b/include/hw/dma/xlnx_csu_dma.h @@ -21,7 +21,7 @@ #ifndef XLNX_CSU_DMA_H #define XLNX_CSU_DMA_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/core/ptimer.h" #include "hw/core/stream.h" diff --git a/include/hw/dma/xlnx_dpdma.h b/include/hw/dma/xlnx_dpdma.h index 484b2e377f0..7cf67aef6e1 100644 --- a/include/hw/dma/xlnx_dpdma.h +++ b/include/hw/dma/xlnx_dpdma.h @@ -25,7 +25,7 @@ #ifndef XLNX_DPDMA_H #define XLNX_DPDMA_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/dma.h" #include "qom/object.h" =20 diff --git a/include/hw/fsi/aspeed_apb2opb.h b/include/hw/fsi/aspeed_apb2op= b.h index 878619eafa7..e42399185ad 100644 --- a/include/hw/fsi/aspeed_apb2opb.h +++ b/include/hw/fsi/aspeed_apb2opb.h @@ -10,7 +10,7 @@ =20 #include "system/memory.h" #include "hw/fsi/fsi-master.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_FSI_OPB "fsi.opb" =20 diff --git a/include/hw/gpio/aspeed_gpio.h b/include/hw/gpio/aspeed_gpio.h index e6b2fe71b50..0ff4539cb2d 100644 --- a/include/hw/gpio/aspeed_gpio.h +++ b/include/hw/gpio/aspeed_gpio.h @@ -10,7 +10,7 @@ #ifndef ASPEED_GPIO_H #define ASPEED_GPIO_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_ASPEED_GPIO "aspeed.gpio" diff --git a/include/hw/gpio/bcm2835_gpio.h b/include/hw/gpio/bcm2835_gpio.h index 1c53a050908..c1410ccbebf 100644 --- a/include/hw/gpio/bcm2835_gpio.h +++ b/include/hw/gpio/bcm2835_gpio.h @@ -15,7 +15,7 @@ #define BCM2835_GPIO_H =20 #include "hw/sd/sd.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 struct BCM2835GpioState { diff --git a/include/hw/gpio/bcm2838_gpio.h b/include/hw/gpio/bcm2838_gpio.h index f2a57a697f2..9324ebcbaeb 100644 --- a/include/hw/gpio/bcm2838_gpio.h +++ b/include/hw/gpio/bcm2838_gpio.h @@ -15,7 +15,7 @@ #define BCM2838_GPIO_H =20 #include "hw/sd/sd.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_BCM2838_GPIO "bcm2838-gpio" diff --git a/include/hw/gpio/imx_gpio.h b/include/hw/gpio/imx_gpio.h index 227860b9f0a..ae2afb3c0fb 100644 --- a/include/hw/gpio/imx_gpio.h +++ b/include/hw/gpio/imx_gpio.h @@ -20,7 +20,7 @@ #ifndef IMX_GPIO_H #define IMX_GPIO_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_IMX_GPIO "imx.gpio" diff --git a/include/hw/gpio/npcm7xx_gpio.h b/include/hw/gpio/npcm7xx_gpio.h index 7c0bf61a960..9b2a3f27d37 100644 --- a/include/hw/gpio/npcm7xx_gpio.h +++ b/include/hw/gpio/npcm7xx_gpio.h @@ -16,7 +16,7 @@ #define NPCM7XX_GPIO_H =20 #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* Number of pins managed by each controller. */ #define NPCM7XX_GPIO_NR_PINS (32) diff --git a/include/hw/gpio/nrf51_gpio.h b/include/hw/gpio/nrf51_gpio.h index fcfa2bac173..661e79b9217 100644 --- a/include/hw/gpio/nrf51_gpio.h +++ b/include/hw/gpio/nrf51_gpio.h @@ -26,7 +26,7 @@ #ifndef NRF51_GPIO_H #define NRF51_GPIO_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_NRF51_GPIO "nrf51_soc.gpio" OBJECT_DECLARE_SIMPLE_TYPE(NRF51GPIOState, NRF51_GPIO) diff --git a/include/hw/gpio/sifive_gpio.h b/include/hw/gpio/sifive_gpio.h index fc53785c9d0..e96cf33df68 100644 --- a/include/hw/gpio/sifive_gpio.h +++ b/include/hw/gpio/sifive_gpio.h @@ -14,7 +14,7 @@ #ifndef SIFIVE_GPIO_H #define SIFIVE_GPIO_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_SIFIVE_GPIO "sifive_soc.gpio" diff --git a/include/hw/gpio/stm32l4x5_gpio.h b/include/hw/gpio/stm32l4x5_g= pio.h index 878bd19fc9b..62197541295 100644 --- a/include/hw/gpio/stm32l4x5_gpio.h +++ b/include/hw/gpio/stm32l4x5_gpio.h @@ -19,7 +19,7 @@ #ifndef HW_STM32L4X5_GPIO_H #define HW_STM32L4X5_GPIO_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_STM32L4X5_GPIO "stm32l4x5-gpio" diff --git a/include/hw/hyperv/vmbus-bridge.h b/include/hw/hyperv/vmbus-bri= dge.h index 1e5419574ee..2cf73075c6f 100644 --- a/include/hw/hyperv/vmbus-bridge.h +++ b/include/hw/hyperv/vmbus-bridge.h @@ -10,7 +10,7 @@ #ifndef HW_HYPERV_VMBUS_BRIDGE_H #define HW_HYPERV_VMBUS_BRIDGE_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/hyperv/vmbus.h" #include "qom/object.h" =20 diff --git a/include/hw/i2c/allwinner-i2c.h b/include/hw/i2c/allwinner-i2c.h index 0e325d265ee..72836cc1017 100644 --- a/include/hw/i2c/allwinner-i2c.h +++ b/include/hw/i2c/allwinner-i2c.h @@ -24,7 +24,7 @@ #ifndef ALLWINNER_I2C_H #define ALLWINNER_I2C_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_AW_I2C "allwinner.i2c" diff --git a/include/hw/i2c/arm_sbcon_i2c.h b/include/hw/i2c/arm_sbcon_i2c.h index da9b5e8f83b..39b99f57bfb 100644 --- a/include/hw/i2c/arm_sbcon_i2c.h +++ b/include/hw/i2c/arm_sbcon_i2c.h @@ -13,7 +13,7 @@ #ifndef HW_I2C_ARM_SBCON_I2C_H #define HW_I2C_ARM_SBCON_I2C_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i2c/bitbang_i2c.h" #include "qom/object.h" =20 diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h index c9c2620a8a3..ffcff2580f0 100644 --- a/include/hw/i2c/aspeed_i2c.h +++ b/include/hw/i2c/aspeed_i2c.h @@ -21,7 +21,7 @@ #define ASPEED_I2C_H =20 #include "hw/i2c/i2c.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/registerfields.h" #include "qom/object.h" =20 diff --git a/include/hw/i2c/bcm2835_i2c.h b/include/hw/i2c/bcm2835_i2c.h index 0a56df4720b..45f876df224 100644 --- a/include/hw/i2c/bcm2835_i2c.h +++ b/include/hw/i2c/bcm2835_i2c.h @@ -24,7 +24,7 @@ * THE SOFTWARE. */ =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i2c/i2c.h" #include "qom/object.h" =20 diff --git a/include/hw/i2c/imx_i2c.h b/include/hw/i2c/imx_i2c.h index e4f91339f58..988a3e284fb 100644 --- a/include/hw/i2c/imx_i2c.h +++ b/include/hw/i2c/imx_i2c.h @@ -21,7 +21,7 @@ #ifndef IMX_I2C_H #define IMX_I2C_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_IMX_I2C "imx.i2c" diff --git a/include/hw/i2c/microbit_i2c.h b/include/hw/i2c/microbit_i2c.h index 3c29e09bf38..a3ec27ff6c2 100644 --- a/include/hw/i2c/microbit_i2c.h +++ b/include/hw/i2c/microbit_i2c.h @@ -11,7 +11,7 @@ #ifndef MICROBIT_I2C_H #define MICROBIT_I2C_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/nrf51.h" #include "qom/object.h" =20 diff --git a/include/hw/i2c/npcm7xx_smbus.h b/include/hw/i2c/npcm7xx_smbus.h index f5adb69c672..dff9bc2f6ed 100644 --- a/include/hw/i2c/npcm7xx_smbus.h +++ b/include/hw/i2c/npcm7xx_smbus.h @@ -19,7 +19,7 @@ #include "system/memory.h" #include "hw/i2c/i2c.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* * Number of addresses this module contains. Do not change this without diff --git a/include/hw/i2c/ppc4xx_i2c.h b/include/hw/i2c/ppc4xx_i2c.h index 4e882fa3c80..5b875eedacc 100644 --- a/include/hw/i2c/ppc4xx_i2c.h +++ b/include/hw/i2c/ppc4xx_i2c.h @@ -27,7 +27,7 @@ #ifndef PPC4XX_I2C_H #define PPC4XX_I2C_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i2c/bitbang_i2c.h" #include "qom/object.h" =20 diff --git a/include/hw/i386/x86-iommu.h b/include/hw/i386/x86-iommu.h index e89f55a5c21..c526a047ab6 100644 --- a/include/hw/i386/x86-iommu.h +++ b/include/hw/i386/x86-iommu.h @@ -20,7 +20,7 @@ #ifndef HW_I386_X86_IOMMU_H #define HW_I386_X86_IOMMU_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/msi.h" #include "qom/object.h" =20 diff --git a/include/hw/ide/ahci-sysbus.h b/include/hw/ide/ahci-sysbus.h index 06eaac8cb60..34d0c8f55ad 100644 --- a/include/hw/ide/ahci-sysbus.h +++ b/include/hw/ide/ahci-sysbus.h @@ -7,7 +7,7 @@ #define HW_IDE_AHCI_SYSBUS_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ide/ahci.h" =20 #define TYPE_SYSBUS_AHCI "sysbus-ahci" diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h index e90f008b667..07d749b3d04 100644 --- a/include/hw/input/i8042.h +++ b/include/hw/input/i8042.h @@ -9,7 +9,7 @@ #define HW_INPUT_I8042_H =20 #include "hw/isa/isa.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/input/ps2.h" #include "qom/object.h" =20 diff --git a/include/hw/input/lasips2.h b/include/hw/input/lasips2.h index fd74883073b..2739f752c8e 100644 --- a/include/hw/input/lasips2.h +++ b/include/hw/input/lasips2.h @@ -20,7 +20,7 @@ #define HW_INPUT_LASIPS2_H =20 #include "exec/hwaddr.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/input/ps2.h" =20 #define TYPE_LASIPS2_PORT "lasips2-port" diff --git a/include/hw/input/pl050.h b/include/hw/input/pl050.h index db662654c58..2cdfa74f73c 100644 --- a/include/hw/input/pl050.h +++ b/include/hw/input/pl050.h @@ -10,7 +10,7 @@ #ifndef HW_PL050_H #define HW_PL050_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/input/ps2.h" #include "hw/core/irq.h" diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h index cd61a634c39..058db3e0890 100644 --- a/include/hw/input/ps2.h +++ b/include/hw/input/ps2.h @@ -25,7 +25,7 @@ #ifndef HW_PS2_H #define HW_PS2_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define PS2_MOUSE_BUTTON_LEFT 0x01 #define PS2_MOUSE_BUTTON_RIGHT 0x02 diff --git a/include/hw/input/stellaris_gamepad.h b/include/hw/input/stella= ris_gamepad.h index 51085e166ca..e011482646f 100644 --- a/include/hw/input/stellaris_gamepad.h +++ b/include/hw/input/stellaris_gamepad.h @@ -11,7 +11,7 @@ #ifndef HW_INPUT_STELLARIS_GAMEPAD_H #define HW_INPUT_STELLARIS_GAMEPAD_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 /* diff --git a/include/hw/intc/allwinner-a10-pic.h b/include/hw/intc/allwinne= r-a10-pic.h index b8364d3ed40..f22059ed85b 100644 --- a/include/hw/intc/allwinner-a10-pic.h +++ b/include/hw/intc/allwinner-a10-pic.h @@ -1,7 +1,7 @@ #ifndef ALLWINNER_A10_PIC_H #define ALLWINNER_A10_PIC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_AW_A10_PIC "allwinner-a10-pic" diff --git a/include/hw/intc/arm_gic_common.h b/include/hw/intc/arm_gic_com= mon.h index 93a3cc2bf81..b169394e6ca 100644 --- a/include/hw/intc/arm_gic_common.h +++ b/include/hw/intc/arm_gic_common.h @@ -21,7 +21,7 @@ #ifndef HW_ARM_GIC_COMMON_H #define HW_ARM_GIC_COMMON_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 /* Maximum number of possible interrupts, determined by the GIC architectu= re */ diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3= _common.h index 61d51915e07..3d24ad22d28 100644 --- a/include/hw/intc/arm_gicv3_common.h +++ b/include/hw/intc/arm_gicv3_common.h @@ -24,7 +24,7 @@ #ifndef HW_ARM_GICV3_COMMON_H #define HW_ARM_GICV3_COMMON_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/arm_gic_common.h" #include "qom/object.h" #include "qemu/notify.h" diff --git a/include/hw/intc/arm_gicv3_its_common.h b/include/hw/intc/arm_g= icv3_its_common.h index 3c7b543b018..05b438aa7ad 100644 --- a/include/hw/intc/arm_gicv3_its_common.h +++ b/include/hw/intc/arm_gicv3_its_common.h @@ -21,7 +21,7 @@ #ifndef QEMU_ARM_GICV3_ITS_COMMON_H #define QEMU_ARM_GICV3_ITS_COMMON_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/arm_gicv3_common.h" #include "qom/object.h" =20 diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h index 7b9964fe7e4..e699546f6a6 100644 --- a/include/hw/intc/armv7m_nvic.h +++ b/include/hw/intc/armv7m_nvic.h @@ -11,7 +11,7 @@ #define HW_ARM_ARMV7M_NVIC_H =20 #include "target/arm/cpu-qom.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/timer/armv7m_systick.h" #include "qom/object.h" =20 diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h index 6dd8effcd89..5d10268fff3 100644 --- a/include/hw/intc/aspeed_intc.h +++ b/include/hw/intc/aspeed_intc.h @@ -8,7 +8,7 @@ #ifndef ASPEED_INTC_H #define ASPEED_INTC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "hw/core/or-irq.h" =20 diff --git a/include/hw/intc/aspeed_vic.h b/include/hw/intc/aspeed_vic.h index 68d6ab997a1..5172f5c9137 100644 --- a/include/hw/intc/aspeed_vic.h +++ b/include/hw/intc/aspeed_vic.h @@ -13,7 +13,7 @@ #ifndef ASPEED_VIC_H #define ASPEED_VIC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_ASPEED_VIC "aspeed.vic" diff --git a/include/hw/intc/bcm2835_ic.h b/include/hw/intc/bcm2835_ic.h index 588eb76c5cb..f9ebaac8f9b 100644 --- a/include/hw/intc/bcm2835_ic.h +++ b/include/hw/intc/bcm2835_ic.h @@ -8,7 +8,7 @@ #ifndef BCM2835_IC_H #define BCM2835_IC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_BCM2835_IC "bcm2835-ic" diff --git a/include/hw/intc/bcm2836_control.h b/include/hw/intc/bcm2836_co= ntrol.h index a410c817e8f..05380f1b855 100644 --- a/include/hw/intc/bcm2836_control.h +++ b/include/hw/intc/bcm2836_control.h @@ -15,7 +15,7 @@ #ifndef BCM2836_CONTROL_H #define BCM2836_CONTROL_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" =20 diff --git a/include/hw/intc/exynos4210_combiner.h b/include/hw/intc/exynos= 4210_combiner.h index bd207a7e6e4..b1db48cb880 100644 --- a/include/hw/intc/exynos4210_combiner.h +++ b/include/hw/intc/exynos4210_combiner.h @@ -23,7 +23,7 @@ #ifndef HW_INTC_EXYNOS4210_COMBINER_H #define HW_INTC_EXYNOS4210_COMBINER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* * State for each output signal of internal combiner diff --git a/include/hw/intc/exynos4210_gic.h b/include/hw/intc/exynos4210_= gic.h index f64c4069c6d..6ffe57c2306 100644 --- a/include/hw/intc/exynos4210_gic.h +++ b/include/hw/intc/exynos4210_gic.h @@ -22,7 +22,7 @@ #ifndef HW_INTC_EXYNOS4210_GIC_H #define HW_INTC_EXYNOS4210_GIC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_EXYNOS4210_GIC "exynos4210.gic" OBJECT_DECLARE_SIMPLE_TYPE(Exynos4210GicState, EXYNOS4210_GIC) diff --git a/include/hw/intc/goldfish_pic.h b/include/hw/intc/goldfish_pic.h index 3e795803672..e61df599b0d 100644 --- a/include/hw/intc/goldfish_pic.h +++ b/include/hw/intc/goldfish_pic.h @@ -10,7 +10,7 @@ #ifndef HW_INTC_GOLDFISH_PIC_H #define HW_INTC_GOLDFISH_PIC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_GOLDFISH_PIC "goldfish_pic" OBJECT_DECLARE_SIMPLE_TYPE(GoldfishPICState, GOLDFISH_PIC) diff --git a/include/hw/intc/grlib_irqmp.h b/include/hw/intc/grlib_irqmp.h index a76acbf9403..e39496ca5df 100644 --- a/include/hw/intc/grlib_irqmp.h +++ b/include/hw/intc/grlib_irqmp.h @@ -27,7 +27,7 @@ #ifndef GRLIB_IRQMP_H #define GRLIB_IRQMP_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* Emulation of GrLib device is base on the GRLIB IP Core User's Manual: * http://www.gaisler.com/products/grlib/grip.pdf diff --git a/include/hw/intc/heathrow_pic.h b/include/hw/intc/heathrow_pic.h index c0a7f6f5460..cfd8a8df2b2 100644 --- a/include/hw/intc/heathrow_pic.h +++ b/include/hw/intc/heathrow_pic.h @@ -26,7 +26,7 @@ #ifndef HW_INTC_HEATHROW_PIC_H #define HW_INTC_HEATHROW_PIC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_HEATHROW "heathrow" diff --git a/include/hw/intc/imx_avic.h b/include/hw/intc/imx_avic.h index 75fbd1a89c7..82ce9037eda 100644 --- a/include/hw/intc/imx_avic.h +++ b/include/hw/intc/imx_avic.h @@ -17,7 +17,7 @@ #ifndef IMX_AVIC_H #define IMX_AVIC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_IMX_AVIC "imx.avic" diff --git a/include/hw/intc/imx_gpcv2.h b/include/hw/intc/imx_gpcv2.h index 7bdee7e80a1..7a3441ac657 100644 --- a/include/hw/intc/imx_gpcv2.h +++ b/include/hw/intc/imx_gpcv2.h @@ -1,7 +1,7 @@ #ifndef IMX_GPCV2_H #define IMX_GPCV2_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 enum IMXGPCv2Registers { diff --git a/include/hw/intc/loongarch_dintc.h b/include/hw/intc/loongarch_= dintc.h index 01bb1e465cb..1f4f65705a7 100644 --- a/include/hw/intc/loongarch_dintc.h +++ b/include/hw/intc/loongarch_dintc.h @@ -6,7 +6,7 @@ */ =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/loongarch/virt.h" #include "system/memory.h" =20 diff --git a/include/hw/intc/loongarch_extioi_common.h b/include/hw/intc/lo= ongarch_extioi_common.h index 1bd2bfa07fc..2dbc2563eb0 100644 --- a/include/hw/intc/loongarch_extioi_common.h +++ b/include/hw/intc/loongarch_extioi_common.h @@ -8,7 +8,7 @@ #define LOONGARCH_EXTIOI_COMMON_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/loongarch/virt.h" #include "system/memory.h" =20 diff --git a/include/hw/intc/loongarch_pch_msi.h b/include/hw/intc/loongarc= h_pch_msi.h index ef4ec4fdeb8..fec51187c21 100644 --- a/include/hw/intc/loongarch_pch_msi.h +++ b/include/hw/intc/loongarch_pch_msi.h @@ -5,7 +5,7 @@ * Copyright (C) 2021 Loongson Technology Corporation Limited */ =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/memory.h" =20 #define TYPE_LOONGARCH_PCH_MSI "loongarch_pch_msi" diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loong= arch_pic_common.h index 179361eb567..1627ec0899d 100644 --- a/include/hw/intc/loongarch_pic_common.h +++ b/include/hw/intc/loongarch_pic_common.h @@ -8,7 +8,7 @@ #define HW_LOONGARCH_PIC_COMMON_H =20 #include "hw/loongarch/virt.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/memory.h" =20 #define PCH_PIC_INT_ID 0x00 diff --git a/include/hw/intc/loongson_ipi.h b/include/hw/intc/loongson_ipi.h index 4e517cc8dc4..afb8488725b 100644 --- a/include/hw/intc/loongson_ipi.h +++ b/include/hw/intc/loongson_ipi.h @@ -10,7 +10,7 @@ =20 #include "qom/object.h" #include "hw/intc/loongson_ipi_common.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_LOONGSON_IPI "loongson_ipi" OBJECT_DECLARE_TYPE(LoongsonIPIState, LoongsonIPIClass, LOONGSON_IPI) diff --git a/include/hw/intc/loongson_ipi_common.h b/include/hw/intc/loongs= on_ipi_common.h index 4fa03bc351f..feb858780a9 100644 --- a/include/hw/intc/loongson_ipi_common.h +++ b/include/hw/intc/loongson_ipi_common.h @@ -9,7 +9,7 @@ #define HW_LOONGSON_IPI_COMMON_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "exec/memattrs.h" #include "system/memory.h" =20 diff --git a/include/hw/intc/loongson_liointc.h b/include/hw/intc/loongson_= liointc.h index 848e65eb359..f400f691b07 100644 --- a/include/hw/intc/loongson_liointc.h +++ b/include/hw/intc/loongson_liointc.h @@ -12,7 +12,7 @@ #define LOONGSON_LIOINTC_H =20 #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_LOONGSON_LIOINTC "loongson.liointc" diff --git a/include/hw/intc/m68k_irqc.h b/include/hw/intc/m68k_irqc.h index 693e33b0aa5..b2b184dbc98 100644 --- a/include/hw/intc/m68k_irqc.h +++ b/include/hw/intc/m68k_irqc.h @@ -10,7 +10,7 @@ #ifndef M68K_IRQC_H #define M68K_IRQC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_M68K_IRQC "m68k-irq-controller" #define M68K_IRQC(obj) OBJECT_CHECK(M68KIRQCState, (obj), \ diff --git a/include/hw/intc/mips_gic.h b/include/hw/intc/mips_gic.h index 5e4c71edd47..e2e6f0a168c 100644 --- a/include/hw/intc/mips_gic.h +++ b/include/hw/intc/mips_gic.h @@ -13,7 +13,7 @@ =20 #include "qemu/units.h" #include "hw/timer/mips_gictimer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "cpu.h" #include "qom/object.h" /* diff --git a/include/hw/intc/realview_gic.h b/include/hw/intc/realview_gic.h index f37339dc0b1..6feaf1a605b 100644 --- a/include/hw/intc/realview_gic.h +++ b/include/hw/intc/realview_gic.h @@ -10,7 +10,7 @@ #ifndef HW_INTC_REALVIEW_GIC_H #define HW_INTC_REALVIEW_GIC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/arm_gic.h" #include "qom/object.h" =20 diff --git a/include/hw/intc/riscv_aclint.h b/include/hw/intc/riscv_aclint.h index 4b7406eec00..5310615cbf6 100644 --- a/include/hw/intc/riscv_aclint.h +++ b/include/hw/intc/riscv_aclint.h @@ -21,7 +21,7 @@ #ifndef HW_RISCV_ACLINT_H #define HW_RISCV_ACLINT_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_RISCV_ACLINT_MTIMER "riscv.aclint.mtimer" =20 diff --git a/include/hw/intc/riscv_aplic.h b/include/hw/intc/riscv_aplic.h index 489b9133c26..c7a4d4ad017 100644 --- a/include/hw/intc/riscv_aplic.h +++ b/include/hw/intc/riscv_aplic.h @@ -19,7 +19,7 @@ #ifndef HW_RISCV_APLIC_H #define HW_RISCV_APLIC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_RISCV_APLIC "riscv.aplic" diff --git a/include/hw/intc/riscv_imsic.h b/include/hw/intc/riscv_imsic.h index 58c2aaa8dc6..fae999731df 100644 --- a/include/hw/intc/riscv_imsic.h +++ b/include/hw/intc/riscv_imsic.h @@ -19,7 +19,7 @@ #ifndef HW_RISCV_IMSIC_H #define HW_RISCV_IMSIC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_RISCV_IMSIC "riscv.imsic" diff --git a/include/hw/intc/rx_icu.h b/include/hw/intc/rx_icu.h index b23504f3dd1..2f2746b8681 100644 --- a/include/hw/intc/rx_icu.h +++ b/include/hw/intc/rx_icu.h @@ -21,7 +21,7 @@ #ifndef HW_INTC_RX_ICU_H #define HW_INTC_RX_ICU_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 enum TRG_MODE { diff --git a/include/hw/intc/sifive_plic.h b/include/hw/intc/sifive_plic.h index d3f45ec2481..32973dbf281 100644 --- a/include/hw/intc/sifive_plic.h +++ b/include/hw/intc/sifive_plic.h @@ -21,7 +21,7 @@ #ifndef HW_SIFIVE_PLIC_H #define HW_SIFIVE_PLIC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_SIFIVE_PLIC "riscv.sifive.plic" diff --git a/include/hw/intc/xlnx-pmu-iomod-intc.h b/include/hw/intc/xlnx-p= mu-iomod-intc.h index e36b5e17629..1a1b0e813d0 100644 --- a/include/hw/intc/xlnx-pmu-iomod-intc.h +++ b/include/hw/intc/xlnx-pmu-iomod-intc.h @@ -25,7 +25,7 @@ #ifndef HW_INTC_XLNX_PMU_IOMOD_INTC_H #define HW_INTC_XLNX_PMU_IOMOD_INTC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "qom/object.h" =20 diff --git a/include/hw/intc/xlnx-zynqmp-ipi.h b/include/hw/intc/xlnx-zynqm= p-ipi.h index 53fc89084af..57ac6e68524 100644 --- a/include/hw/intc/xlnx-zynqmp-ipi.h +++ b/include/hw/intc/xlnx-zynqmp-ipi.h @@ -25,7 +25,7 @@ #ifndef XLNX_ZYNQMP_IPI_H #define XLNX_ZYNQMP_IPI_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "qom/object.h" =20 diff --git a/include/hw/m68k/q800-glue.h b/include/hw/m68k/q800-glue.h index 04fac25f6c2..ac3404d6db8 100644 --- a/include/hw/m68k/q800-glue.h +++ b/include/hw/m68k/q800-glue.h @@ -23,7 +23,7 @@ #ifndef HW_Q800_GLUE_H #define HW_Q800_GLUE_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_GLUE "q800-glue" OBJECT_DECLARE_SIMPLE_TYPE(GLUEState, GLUE) diff --git a/include/hw/mem/npcm7xx_mc.h b/include/hw/mem/npcm7xx_mc.h index 568cc35fdd7..9c724e83fd2 100644 --- a/include/hw/mem/npcm7xx_mc.h +++ b/include/hw/mem/npcm7xx_mc.h @@ -17,7 +17,7 @@ #define NPCM7XX_MC_H =20 #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /** * struct NPCM7xxMCState - Device state for the memory controller. diff --git a/include/hw/mips/cps.h b/include/hw/mips/cps.h index e7309841d08..878b4d819f4 100644 --- a/include/hw/mips/cps.h +++ b/include/hw/mips/cps.h @@ -20,7 +20,7 @@ #ifndef MIPS_CPS_H #define MIPS_CPS_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/clock.h" #include "hw/misc/mips_cmgcr.h" #include "hw/intc/mips_gic.h" diff --git a/include/hw/misc/a9scu.h b/include/hw/misc/a9scu.h index c3759fb8c8c..312fb29434b 100644 --- a/include/hw/misc/a9scu.h +++ b/include/hw/misc/a9scu.h @@ -10,7 +10,7 @@ #ifndef HW_MISC_A9SCU_H #define HW_MISC_A9SCU_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 /* A9MP private memory region. */ diff --git a/include/hw/misc/allwinner-a10-ccm.h b/include/hw/misc/allwinne= r-a10-ccm.h index 7f22532efaa..109b83f4df6 100644 --- a/include/hw/misc/allwinner-a10-ccm.h +++ b/include/hw/misc/allwinner-a10-ccm.h @@ -24,7 +24,7 @@ #define HW_MISC_ALLWINNER_A10_CCM_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /** * @name Constants diff --git a/include/hw/misc/allwinner-a10-dramc.h b/include/hw/misc/allwin= ner-a10-dramc.h index a1ae621e217..44663dee44a 100644 --- a/include/hw/misc/allwinner-a10-dramc.h +++ b/include/hw/misc/allwinner-a10-dramc.h @@ -24,7 +24,7 @@ #define HW_MISC_ALLWINNER_A10_DRAMC_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" =20 /** diff --git a/include/hw/misc/allwinner-cpucfg.h b/include/hw/misc/allwinner= -cpucfg.h index a717b47299a..0214f1fb770 100644 --- a/include/hw/misc/allwinner-cpucfg.h +++ b/include/hw/misc/allwinner-cpucfg.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_CPUCFG_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /** * Object model diff --git a/include/hw/misc/allwinner-h3-ccu.h b/include/hw/misc/allwinner= -h3-ccu.h index a04875bfca3..b8a17216865 100644 --- a/include/hw/misc/allwinner-h3-ccu.h +++ b/include/hw/misc/allwinner-h3-ccu.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_H3_CCU_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /** * @name Constants diff --git a/include/hw/misc/allwinner-h3-dramc.h b/include/hw/misc/allwinn= er-h3-dramc.h index 0b6c877ef74..0435120ff92 100644 --- a/include/hw/misc/allwinner-h3-dramc.h +++ b/include/hw/misc/allwinner-h3-dramc.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_H3_DRAMC_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "exec/hwaddr.h" =20 /** diff --git a/include/hw/misc/allwinner-h3-sysctrl.h b/include/hw/misc/allwi= nner-h3-sysctrl.h index ec1c220535e..ff886450f3a 100644 --- a/include/hw/misc/allwinner-h3-sysctrl.h +++ b/include/hw/misc/allwinner-h3-sysctrl.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_H3_SYSCTRL_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /** * @name Constants diff --git a/include/hw/misc/allwinner-r40-ccu.h b/include/hw/misc/allwinne= r-r40-ccu.h index ceb74eff923..4f1cc4fe115 100644 --- a/include/hw/misc/allwinner-r40-ccu.h +++ b/include/hw/misc/allwinner-r40-ccu.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_R40_CCU_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /** * @name Constants diff --git a/include/hw/misc/allwinner-r40-dramc.h b/include/hw/misc/allwin= ner-r40-dramc.h index 6a1a3a78935..b823e9eb524 100644 --- a/include/hw/misc/allwinner-r40-dramc.h +++ b/include/hw/misc/allwinner-r40-dramc.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_R40_DRAMC_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "exec/hwaddr.h" =20 /** diff --git a/include/hw/misc/allwinner-sid.h b/include/hw/misc/allwinner-si= d.h index 3bfa887a969..cfa22a4d7f3 100644 --- a/include/hw/misc/allwinner-sid.h +++ b/include/hw/misc/allwinner-sid.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_SID_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/uuid.h" =20 /** diff --git a/include/hw/misc/allwinner-sramc.h b/include/hw/misc/allwinner-= sramc.h index 66b01b8d044..43fc338a589 100644 --- a/include/hw/misc/allwinner-sramc.h +++ b/include/hw/misc/allwinner-sramc.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_SRAMC_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/uuid.h" =20 /** diff --git a/include/hw/misc/arm11scu.h b/include/hw/misc/arm11scu.h index e5c0282aecf..d7ce0446a93 100644 --- a/include/hw/misc/arm11scu.h +++ b/include/hw/misc/arm11scu.h @@ -11,7 +11,7 @@ #ifndef HW_MISC_ARM11SCU_H #define HW_MISC_ARM11SCU_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_ARM11_SCU "arm11-scu" diff --git a/include/hw/misc/armsse-cpu-pwrctrl.h b/include/hw/misc/armsse-= cpu-pwrctrl.h index 51d45ede7db..1d9c50825bf 100644 --- a/include/hw/misc/armsse-cpu-pwrctrl.h +++ b/include/hw/misc/armsse-cpu-pwrctrl.h @@ -21,7 +21,7 @@ #ifndef HW_MISC_ARMSSE_CPU_PWRCTRL_H #define HW_MISC_ARMSSE_CPU_PWRCTRL_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_ARMSSE_CPU_PWRCTRL "armsse-cpu-pwrctrl" diff --git a/include/hw/misc/armsse-cpuid.h b/include/hw/misc/armsse-cpuid.h index 9c0926322cb..0daf466972a 100644 --- a/include/hw/misc/armsse-cpuid.h +++ b/include/hw/misc/armsse-cpuid.h @@ -22,7 +22,7 @@ #ifndef HW_MISC_ARMSSE_CPUID_H #define HW_MISC_ARMSSE_CPUID_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_ARMSSE_CPUID "armsse-cpuid" diff --git a/include/hw/misc/armsse-mhu.h b/include/hw/misc/armsse-mhu.h index 41925ded89b..e34d6c100bf 100644 --- a/include/hw/misc/armsse-mhu.h +++ b/include/hw/misc/armsse-mhu.h @@ -23,7 +23,7 @@ #ifndef HW_MISC_ARMSSE_MHU_H #define HW_MISC_ARMSSE_MHU_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_ARMSSE_MHU "armsse-mhu" diff --git a/include/hw/misc/armv7m_ras.h b/include/hw/misc/armv7m_ras.h index ba6daccf3fc..2b692fa5f9e 100644 --- a/include/hw/misc/armv7m_ras.h +++ b/include/hw/misc/armv7m_ras.h @@ -21,7 +21,7 @@ #ifndef HW_MISC_ARMV7M_RAS_H #define HW_MISC_ARMV7M_RAS_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_ARMV7M_RAS "armv7m-ras" OBJECT_DECLARE_SIMPLE_TYPE(ARMv7MRAS, ARMV7M_RAS) diff --git a/include/hw/misc/aspeed_hace.h b/include/hw/misc/aspeed_hace.h index d5d07c6c021..b5416b0cb5d 100644 --- a/include/hw/misc/aspeed_hace.h +++ b/include/hw/misc/aspeed_hace.h @@ -10,7 +10,7 @@ #ifndef ASPEED_HACE_H #define ASPEED_HACE_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "crypto/hash.h" =20 #define TYPE_ASPEED_HACE "aspeed.hace" diff --git a/include/hw/misc/aspeed_i3c.h b/include/hw/misc/aspeed_i3c.h index 39679dfa1ae..7a984e1f01a 100644 --- a/include/hw/misc/aspeed_i3c.h +++ b/include/hw/misc/aspeed_i3c.h @@ -10,7 +10,7 @@ #ifndef ASPEED_I3C_H #define ASPEED_I3C_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_ASPEED_I3C "aspeed.i3c" #define TYPE_ASPEED_I3C_DEVICE "aspeed.i3c.device" diff --git a/include/hw/misc/aspeed_lpc.h b/include/hw/misc/aspeed_lpc.h index fa398959af2..64c1039f9ce 100644 --- a/include/hw/misc/aspeed_lpc.h +++ b/include/hw/misc/aspeed_lpc.h @@ -10,7 +10,7 @@ #ifndef ASPEED_LPC_H #define ASPEED_LPC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_ASPEED_LPC "aspeed.lpc" #define ASPEED_LPC(obj) OBJECT_CHECK(AspeedLPCState, (obj), TYPE_ASPEED_LP= C) diff --git a/include/hw/misc/aspeed_peci.h b/include/hw/misc/aspeed_peci.h index 8382707d9fd..7680e5befb3 100644 --- a/include/hw/misc/aspeed_peci.h +++ b/include/hw/misc/aspeed_peci.h @@ -10,7 +10,7 @@ #ifndef ASPEED_PECI_H #define ASPEED_PECI_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define ASPEED_PECI_NR_REGS ((0xFC + 4) >> 2) #define TYPE_ASPEED_PECI "aspeed.peci" diff --git a/include/hw/misc/aspeed_sbc.h b/include/hw/misc/aspeed_sbc.h index 7d640a022e4..07c7c22a86a 100644 --- a/include/hw/misc/aspeed_sbc.h +++ b/include/hw/misc/aspeed_sbc.h @@ -9,7 +9,7 @@ #ifndef ASPEED_SBC_H #define ASPEED_SBC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/nvram/aspeed_otp.h" =20 #define TYPE_ASPEED_SBC "aspeed.sbc" diff --git a/include/hw/misc/aspeed_scu.h b/include/hw/misc/aspeed_scu.h index 684b48b7222..35b841960af 100644 --- a/include/hw/misc/aspeed_scu.h +++ b/include/hw/misc/aspeed_scu.h @@ -11,7 +11,7 @@ #ifndef ASPEED_SCU_H #define ASPEED_SCU_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_ASPEED_SCU "aspeed.scu" diff --git a/include/hw/misc/aspeed_sdmc.h b/include/hw/misc/aspeed_sdmc.h index 61c979583ae..806b1cbc58f 100644 --- a/include/hw/misc/aspeed_sdmc.h +++ b/include/hw/misc/aspeed_sdmc.h @@ -9,7 +9,7 @@ #ifndef ASPEED_SDMC_H #define ASPEED_SDMC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_ASPEED_SDMC "aspeed.sdmc" diff --git a/include/hw/misc/aspeed_sli.h b/include/hw/misc/aspeed_sli.h index 23f346ab934..fa8d9fbc531 100644 --- a/include/hw/misc/aspeed_sli.h +++ b/include/hw/misc/aspeed_sli.h @@ -8,7 +8,7 @@ #ifndef ASPEED_SLI_H #define ASPEED_SLI_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_ASPEED_SLI "aspeed.sli" #define TYPE_ASPEED_2700_SLI TYPE_ASPEED_SLI "-ast2700" diff --git a/include/hw/misc/aspeed_xdma.h b/include/hw/misc/aspeed_xdma.h index b1478fd1c68..0089da9f1fd 100644 --- a/include/hw/misc/aspeed_xdma.h +++ b/include/hw/misc/aspeed_xdma.h @@ -9,7 +9,7 @@ #ifndef ASPEED_XDMA_H #define ASPEED_XDMA_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_ASPEED_XDMA "aspeed.xdma" diff --git a/include/hw/misc/avr_power.h b/include/hw/misc/avr_power.h index 388e421aa7b..5de78c5125f 100644 --- a/include/hw/misc/avr_power.h +++ b/include/hw/misc/avr_power.h @@ -25,7 +25,7 @@ #ifndef HW_MISC_AVR_POWER_H #define HW_MISC_AVR_POWER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 =20 diff --git a/include/hw/misc/bcm2835_cprman.h b/include/hw/misc/bcm2835_cpr= man.h index 7b2c0a54642..8146bca3ae9 100644 --- a/include/hw/misc/bcm2835_cprman.h +++ b/include/hw/misc/bcm2835_cprman.h @@ -9,7 +9,7 @@ #ifndef HW_MISC_BCM2835_CPRMAN_H #define HW_MISC_BCM2835_CPRMAN_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-clock.h" =20 #define TYPE_BCM2835_CPRMAN "bcm2835-cprman" diff --git a/include/hw/misc/bcm2835_mbox.h b/include/hw/misc/bcm2835_mbox.h index ade27af25d0..571741c06e2 100644 --- a/include/hw/misc/bcm2835_mbox.h +++ b/include/hw/misc/bcm2835_mbox.h @@ -9,7 +9,7 @@ #define BCM2835_MBOX_H =20 #include "bcm2835_mbox_defs.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_BCM2835_MBOX "bcm2835-mbox" diff --git a/include/hw/misc/bcm2835_mphi.h b/include/hw/misc/bcm2835_mphi.h index 1a451685e8e..4ddf8ba6521 100644 --- a/include/hw/misc/bcm2835_mphi.h +++ b/include/hw/misc/bcm2835_mphi.h @@ -18,7 +18,7 @@ #define HW_MISC_BCM2835_MPHI_H =20 #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define MPHI_MMIO_SIZE 0x1000 diff --git a/include/hw/misc/bcm2835_powermgt.h b/include/hw/misc/bcm2835_p= owermgt.h index 303b9a6f684..fb0740c01ec 100644 --- a/include/hw/misc/bcm2835_powermgt.h +++ b/include/hw/misc/bcm2835_powermgt.h @@ -11,7 +11,7 @@ #ifndef BCM2835_POWERMGT_H #define BCM2835_POWERMGT_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_BCM2835_POWERMGT "bcm2835-powermgt" diff --git a/include/hw/misc/bcm2835_property.h b/include/hw/misc/bcm2835_p= roperty.h index 2f93fd0c757..53d2a92d173 100644 --- a/include/hw/misc/bcm2835_property.h +++ b/include/hw/misc/bcm2835_property.h @@ -8,7 +8,7 @@ #ifndef BCM2835_PROPERTY_H #define BCM2835_PROPERTY_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "hw/display/bcm2835_fb.h" #include "hw/nvram/bcm2835_otp.h" diff --git a/include/hw/misc/bcm2835_rng.h b/include/hw/misc/bcm2835_rng.h index 7c1fb3ef405..eaf77f5103d 100644 --- a/include/hw/misc/bcm2835_rng.h +++ b/include/hw/misc/bcm2835_rng.h @@ -10,7 +10,7 @@ #ifndef BCM2835_RNG_H #define BCM2835_RNG_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_BCM2835_RNG "bcm2835-rng" diff --git a/include/hw/misc/bcm2835_thermal.h b/include/hw/misc/bcm2835_th= ermal.h index f90f9e487ce..13ffc61c1a7 100644 --- a/include/hw/misc/bcm2835_thermal.h +++ b/include/hw/misc/bcm2835_thermal.h @@ -9,7 +9,7 @@ #ifndef HW_MISC_BCM2835_THERMAL_H #define HW_MISC_BCM2835_THERMAL_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_BCM2835_THERMAL "bcm2835-thermal" diff --git a/include/hw/misc/djmemc.h b/include/hw/misc/djmemc.h index 82d4e4a2fee..76d6b366ff3 100644 --- a/include/hw/misc/djmemc.h +++ b/include/hw/misc/djmemc.h @@ -8,7 +8,7 @@ #ifndef HW_MISC_DJMEMC_H #define HW_MISC_DJMEMC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define DJMEMC_SIZE 0x2000 #define DJMEMC_NUM_REGS (0x38 / sizeof(uint32_t)) diff --git a/include/hw/misc/imx6_src.h b/include/hw/misc/imx6_src.h index f380da3810f..801b5b6a660 100644 --- a/include/hw/misc/imx6_src.h +++ b/include/hw/misc/imx6_src.h @@ -11,7 +11,7 @@ #ifndef IMX6_SRC_H #define IMX6_SRC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/bitops.h" #include "qom/object.h" =20 diff --git a/include/hw/misc/imx7_gpr.h b/include/hw/misc/imx7_gpr.h index df364bd8f09..5cb7d50a694 100644 --- a/include/hw/misc/imx7_gpr.h +++ b/include/hw/misc/imx7_gpr.h @@ -13,7 +13,7 @@ #define IMX7_GPR_H =20 #include "qemu/bitops.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_IMX7_GPR "imx7.gpr" diff --git a/include/hw/misc/imx7_snvs.h b/include/hw/misc/imx7_snvs.h index 1272076086a..90f69a6dd67 100644 --- a/include/hw/misc/imx7_snvs.h +++ b/include/hw/misc/imx7_snvs.h @@ -13,7 +13,7 @@ #define IMX7_SNVS_H =20 #include "qemu/bitops.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 =20 diff --git a/include/hw/misc/imx7_src.h b/include/hw/misc/imx7_src.h index b4b97dcb1c1..55b58a03bf3 100644 --- a/include/hw/misc/imx7_src.h +++ b/include/hw/misc/imx7_src.h @@ -10,7 +10,7 @@ #ifndef IMX7_SRC_H #define IMX7_SRC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/bitops.h" #include "qom/object.h" =20 diff --git a/include/hw/misc/imx8mp_analog.h b/include/hw/misc/imx8mp_analo= g.h index 955f03215a0..6996e537718 100644 --- a/include/hw/misc/imx8mp_analog.h +++ b/include/hw/misc/imx8mp_analog.h @@ -10,7 +10,7 @@ #define IMX8MP_ANALOG_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 enum IMX8MPAnalogRegisters { ANALOG_AUDIO_PLL1_GEN_CTRL =3D 0x000 / 4, diff --git a/include/hw/misc/imx_ccm.h b/include/hw/misc/imx_ccm.h index 7e5678e9726..c4212d04ea6 100644 --- a/include/hw/misc/imx_ccm.h +++ b/include/hw/misc/imx_ccm.h @@ -11,7 +11,7 @@ #ifndef IMX_CCM_H #define IMX_CCM_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define CKIL_FREQ 32768 /* nominal 32khz clock */ diff --git a/include/hw/misc/imx_rngc.h b/include/hw/misc/imx_rngc.h index 34ad6992259..5fb17551b00 100644 --- a/include/hw/misc/imx_rngc.h +++ b/include/hw/misc/imx_rngc.h @@ -10,7 +10,7 @@ #ifndef IMX_RNGC_H #define IMX_RNGC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_IMX_RNGC "imx.rngc" diff --git a/include/hw/misc/iotkit-secctl.h b/include/hw/misc/iotkit-secct= l.h index 79a36283201..1c189eb7214 100644 --- a/include/hw/misc/iotkit-secctl.h +++ b/include/hw/misc/iotkit-secctl.h @@ -55,7 +55,7 @@ #ifndef IOTKIT_SECCTL_H #define IOTKIT_SECCTL_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_IOTKIT_SECCTL "iotkit-secctl" diff --git a/include/hw/misc/iotkit-sysctl.h b/include/hw/misc/iotkit-sysct= l.h index 481e27f4db1..ce72258a847 100644 --- a/include/hw/misc/iotkit-sysctl.h +++ b/include/hw/misc/iotkit-sysctl.h @@ -26,7 +26,7 @@ #ifndef HW_MISC_IOTKIT_SYSCTL_H #define HW_MISC_IOTKIT_SYSCTL_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_IOTKIT_SYSCTL "iotkit-sysctl" diff --git a/include/hw/misc/iotkit-sysinfo.h b/include/hw/misc/iotkit-sysi= nfo.h index 91c23f90d23..36dc702c53d 100644 --- a/include/hw/misc/iotkit-sysinfo.h +++ b/include/hw/misc/iotkit-sysinfo.h @@ -22,7 +22,7 @@ #ifndef HW_MISC_IOTKIT_SYSINFO_H #define HW_MISC_IOTKIT_SYSINFO_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_IOTKIT_SYSINFO "iotkit-sysinfo" diff --git a/include/hw/misc/ivshmem-flat.h b/include/hw/misc/ivshmem-flat.h index d656e578085..4e7277f386c 100644 --- a/include/hw/misc/ivshmem-flat.h +++ b/include/hw/misc/ivshmem-flat.h @@ -16,7 +16,7 @@ #include "chardev/char-fe.h" #include "system/memory.h" #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define IVSHMEM_MAX_VECTOR_NUM 64 =20 diff --git a/include/hw/misc/lasi.h b/include/hw/misc/lasi.h index 5e40c6aebdf..8bf72404037 100644 --- a/include/hw/misc/lasi.h +++ b/include/hw/misc/lasi.h @@ -14,7 +14,7 @@ =20 #include "system/address-spaces.h" #include "hw/core/boards.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_LASI_CHIP "lasi-chip" OBJECT_DECLARE_SIMPLE_TYPE(LasiState, LASI_CHIP) diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h index 6a152281505..114f41db4c7 100644 --- a/include/hw/misc/mac_via.h +++ b/include/hw/misc/mac_via.h @@ -10,7 +10,7 @@ #define HW_MISC_MAC_VIA_H =20 #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/mos6522.h" #include "hw/input/adb.h" #include "qom/object.h" diff --git a/include/hw/misc/macio/gpio.h b/include/hw/misc/macio/gpio.h index 7d2aa886c24..157ea0659b3 100644 --- a/include/hw/misc/macio/gpio.h +++ b/include/hw/misc/macio/gpio.h @@ -27,7 +27,7 @@ #define MACIO_GPIO_H =20 #include "hw/ppc/openpic.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_MACIO_GPIO "macio-gpio" diff --git a/include/hw/misc/max78000_aes.h b/include/hw/misc/max78000_aes.h index 407c45ef61e..f68ab076960 100644 --- a/include/hw/misc/max78000_aes.h +++ b/include/hw/misc/max78000_aes.h @@ -8,7 +8,7 @@ #ifndef HW_MAX78000_AES_H #define HW_MAX78000_AES_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "crypto/aes.h" #include "qom/object.h" =20 diff --git a/include/hw/misc/max78000_gcr.h b/include/hw/misc/max78000_gcr.h index d5858a40f3b..c209766fa98 100644 --- a/include/hw/misc/max78000_gcr.h +++ b/include/hw/misc/max78000_gcr.h @@ -8,7 +8,7 @@ #ifndef HW_MAX78000_GCR_H #define HW_MAX78000_GCR_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_MAX78000_GCR "max78000-gcr" diff --git a/include/hw/misc/max78000_icc.h b/include/hw/misc/max78000_icc.h index 6fe2bb7a156..a8f1d451bd6 100644 --- a/include/hw/misc/max78000_icc.h +++ b/include/hw/misc/max78000_icc.h @@ -9,7 +9,7 @@ #ifndef HW_MAX78000_ICC_H #define HW_MAX78000_ICC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_MAX78000_ICC "max78000-icc" diff --git a/include/hw/misc/max78000_trng.h b/include/hw/misc/max78000_trn= g.h index c5a8129b6a0..a027f4b62c7 100644 --- a/include/hw/misc/max78000_trng.h +++ b/include/hw/misc/max78000_trng.h @@ -8,7 +8,7 @@ #ifndef HW_MAX78000_TRNG_H #define HW_MAX78000_TRNG_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_MAX78000_TRNG "max78000-trng" diff --git a/include/hw/misc/mchp_pfsoc_dmc.h b/include/hw/misc/mchp_pfsoc_= dmc.h index 3bc1581e0f2..2ed582fb8ce 100644 --- a/include/hw/misc/mchp_pfsoc_dmc.h +++ b/include/hw/misc/mchp_pfsoc_dmc.h @@ -23,7 +23,7 @@ #ifndef MCHP_PFSOC_DMC_H #define MCHP_PFSOC_DMC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* DDR SGMII PHY module */ =20 diff --git a/include/hw/misc/mchp_pfsoc_ioscb.h b/include/hw/misc/mchp_pfso= c_ioscb.h index 3fd3e749665..eaaa2ac5d98 100644 --- a/include/hw/misc/mchp_pfsoc_ioscb.h +++ b/include/hw/misc/mchp_pfsoc_ioscb.h @@ -23,7 +23,7 @@ #ifndef MCHP_PFSOC_IOSCB_H #define MCHP_PFSOC_IOSCB_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 typedef struct MchpPfSoCIoscbState { SysBusDevice parent; diff --git a/include/hw/misc/mchp_pfsoc_sysreg.h b/include/hw/misc/mchp_pfs= oc_sysreg.h index c2232bd28d0..c2b3688a94b 100644 --- a/include/hw/misc/mchp_pfsoc_sysreg.h +++ b/include/hw/misc/mchp_pfsoc_sysreg.h @@ -23,7 +23,7 @@ #ifndef MCHP_PFSOC_SYSREG_H #define MCHP_PFSOC_SYSREG_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define MCHP_PFSOC_SYSREG_REG_SIZE 0x2000 =20 diff --git a/include/hw/misc/mips_cmgcr.h b/include/hw/misc/mips_cmgcr.h index db4bf5f4499..cec0edd6205 100644 --- a/include/hw/misc/mips_cmgcr.h +++ b/include/hw/misc/mips_cmgcr.h @@ -10,7 +10,7 @@ #ifndef MIPS_CMGCR_H #define MIPS_CMGCR_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_MIPS_GCR "mips-gcr" diff --git a/include/hw/misc/mips_cpc.h b/include/hw/misc/mips_cpc.h index fcafbd5e002..73ed7597e82 100644 --- a/include/hw/misc/mips_cpc.h +++ b/include/hw/misc/mips_cpc.h @@ -20,7 +20,7 @@ #ifndef MIPS_CPC_H #define MIPS_CPC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define CPC_ADDRSPACE_SZ 0x6000 diff --git a/include/hw/misc/mips_itu.h b/include/hw/misc/mips_itu.h index 27c9a1090d5..0d1c9c419c4 100644 --- a/include/hw/misc/mips_itu.h +++ b/include/hw/misc/mips_itu.h @@ -20,7 +20,7 @@ #ifndef MIPS_ITU_H #define MIPS_ITU_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_MIPS_ITU "mips-itu" diff --git a/include/hw/misc/mos6522.h b/include/hw/misc/mos6522.h index 920871a598b..150e30a2c11 100644 --- a/include/hw/misc/mos6522.h +++ b/include/hw/misc/mos6522.h @@ -28,7 +28,7 @@ #define MOS6522_H =20 #include "exec/hwaddr.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define MOS6522_NUM_REGS 16 diff --git a/include/hw/misc/mps2-fpgaio.h b/include/hw/misc/mps2-fpgaio.h index 7b8bd604de0..edd9f231212 100644 --- a/include/hw/misc/mps2-fpgaio.h +++ b/include/hw/misc/mps2-fpgaio.h @@ -21,7 +21,7 @@ #ifndef MPS2_FPGAIO_H #define MPS2_FPGAIO_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/led.h" #include "qom/object.h" =20 diff --git a/include/hw/misc/mps2-scc.h b/include/hw/misc/mps2-scc.h index 8ff188c06b1..989b2e057dc 100644 --- a/include/hw/misc/mps2-scc.h +++ b/include/hw/misc/mps2-scc.h @@ -30,7 +30,7 @@ #ifndef MPS2_SCC_H #define MPS2_SCC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/led.h" #include "qom/object.h" =20 diff --git a/include/hw/misc/msf2-sysreg.h b/include/hw/misc/msf2-sysreg.h index fc1890e710d..e213aedfb73 100644 --- a/include/hw/misc/msf2-sysreg.h +++ b/include/hw/misc/msf2-sysreg.h @@ -25,7 +25,7 @@ #ifndef HW_MSF2_SYSREG_H #define HW_MSF2_SYSREG_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 enum { diff --git a/include/hw/misc/npcm7xx_mft.h b/include/hw/misc/npcm7xx_mft.h index 79855b6f25d..406ec944434 100644 --- a/include/hw/misc/npcm7xx_mft.h +++ b/include/hw/misc/npcm7xx_mft.h @@ -19,7 +19,7 @@ #include "system/memory.h" #include "hw/core/clock.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 /* Max Fan input number. */ diff --git a/include/hw/misc/npcm7xx_pwm.h b/include/hw/misc/npcm7xx_pwm.h index 6a54b40005d..b5ae9338049 100644 --- a/include/hw/misc/npcm7xx_pwm.h +++ b/include/hw/misc/npcm7xx_pwm.h @@ -17,7 +17,7 @@ #define NPCM7XX_PWM_H =20 #include "hw/core/clock.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" =20 /* Each PWM module holds 4 PWM channels. */ diff --git a/include/hw/misc/npcm7xx_rng.h b/include/hw/misc/npcm7xx_rng.h index 650375dc2cd..90858a71f5c 100644 --- a/include/hw/misc/npcm7xx_rng.h +++ b/include/hw/misc/npcm7xx_rng.h @@ -16,7 +16,7 @@ #ifndef NPCM7XX_RNG_H #define NPCM7XX_RNG_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 struct NPCM7xxRNGState { SysBusDevice parent; diff --git a/include/hw/misc/npcm_clk.h b/include/hw/misc/npcm_clk.h index 50b93a0094d..74c5c1634a9 100644 --- a/include/hw/misc/npcm_clk.h +++ b/include/hw/misc/npcm_clk.h @@ -18,7 +18,7 @@ =20 #include "system/memory.h" #include "hw/core/clock.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define NPCM7XX_CLK_NR_REGS (0x70 / sizeof(uint32_t)) #define NPCM8XX_CLK_NR_REGS (0xc4 / sizeof(uint32_t)) diff --git a/include/hw/misc/npcm_gcr.h b/include/hw/misc/npcm_gcr.h index 702e7fddb1f..97a6e531b89 100644 --- a/include/hw/misc/npcm_gcr.h +++ b/include/hw/misc/npcm_gcr.h @@ -17,7 +17,7 @@ #define NPCM_GCR_H =20 #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 /* diff --git a/include/hw/misc/nrf51_rng.h b/include/hw/misc/nrf51_rng.h index 9aff9a76f89..0c2f6d2257b 100644 --- a/include/hw/misc/nrf51_rng.h +++ b/include/hw/misc/nrf51_rng.h @@ -34,7 +34,7 @@ #ifndef NRF51_RNG_H #define NRF51_RNG_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" #define TYPE_NRF51_RNG "nrf51_soc.rng" diff --git a/include/hw/misc/sifive_e_aon.h b/include/hw/misc/sifive_e_aon.h index 2ae1c4139ca..efa2c3023f6 100644 --- a/include/hw/misc/sifive_e_aon.h +++ b/include/hw/misc/sifive_e_aon.h @@ -19,7 +19,7 @@ #ifndef HW_SIFIVE_AON_H #define HW_SIFIVE_AON_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_SIFIVE_E_AON "riscv.sifive.e.aon" diff --git a/include/hw/misc/sifive_e_prci.h b/include/hw/misc/sifive_e_prc= i.h index 6aa949e910d..d0abd59f4b7 100644 --- a/include/hw/misc/sifive_e_prci.h +++ b/include/hw/misc/sifive_e_prci.h @@ -19,7 +19,7 @@ #ifndef HW_SIFIVE_E_PRCI_H #define HW_SIFIVE_E_PRCI_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 enum { SIFIVE_E_PRCI_HFROSCCFG =3D 0x0, diff --git a/include/hw/misc/sifive_test.h b/include/hw/misc/sifive_test.h index 88a38d00c59..85afd352631 100644 --- a/include/hw/misc/sifive_test.h +++ b/include/hw/misc/sifive_test.h @@ -19,7 +19,7 @@ #ifndef HW_SIFIVE_TEST_H #define HW_SIFIVE_TEST_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_SIFIVE_TEST "riscv.sifive.test" diff --git a/include/hw/misc/sifive_u_otp.h b/include/hw/misc/sifive_u_otp.h index 170d2148f25..b3d2091a58a 100644 --- a/include/hw/misc/sifive_u_otp.h +++ b/include/hw/misc/sifive_u_otp.h @@ -19,7 +19,7 @@ #ifndef HW_SIFIVE_U_OTP_H #define HW_SIFIVE_U_OTP_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define SIFIVE_U_OTP_PA 0x00 #define SIFIVE_U_OTP_PAIO 0x04 diff --git a/include/hw/misc/sifive_u_prci.h b/include/hw/misc/sifive_u_prc= i.h index 4d2491ad46d..c0cc755a26c 100644 --- a/include/hw/misc/sifive_u_prci.h +++ b/include/hw/misc/sifive_u_prci.h @@ -19,7 +19,7 @@ #ifndef HW_SIFIVE_U_PRCI_H #define HW_SIFIVE_U_PRCI_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define SIFIVE_U_PRCI_HFXOSCCFG 0x00 #define SIFIVE_U_PRCI_COREPLLCFG0 0x04 diff --git a/include/hw/misc/stm32_rcc.h b/include/hw/misc/stm32_rcc.h index ffbdf202ea5..4dccacc2db5 100644 --- a/include/hw/misc/stm32_rcc.h +++ b/include/hw/misc/stm32_rcc.h @@ -25,7 +25,7 @@ #ifndef HW_STM32_RCC_H #define HW_STM32_RCC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define STM32_RCC_CR 0x00 diff --git a/include/hw/misc/stm32f2xx_syscfg.h b/include/hw/misc/stm32f2xx= _syscfg.h index 8595a3b31b0..89e47aa091f 100644 --- a/include/hw/misc/stm32f2xx_syscfg.h +++ b/include/hw/misc/stm32f2xx_syscfg.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F2XX_SYSCFG_H #define HW_STM32F2XX_SYSCFG_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define SYSCFG_MEMRMP 0x00 diff --git a/include/hw/misc/stm32f4xx_exti.h b/include/hw/misc/stm32f4xx_e= xti.h index fc11c595fa4..a2d57ee3459 100644 --- a/include/hw/misc/stm32f4xx_exti.h +++ b/include/hw/misc/stm32f4xx_exti.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F4XX_EXTI_H #define HW_STM32F4XX_EXTI_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define EXTI_IMR 0x00 diff --git a/include/hw/misc/stm32f4xx_syscfg.h b/include/hw/misc/stm32f4xx= _syscfg.h index 9fce67f4b48..e6d2bc1ff3b 100644 --- a/include/hw/misc/stm32f4xx_syscfg.h +++ b/include/hw/misc/stm32f4xx_syscfg.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F4XX_SYSCFG_H #define HW_STM32F4XX_SYSCFG_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define SYSCFG_MEMRMP 0x00 diff --git a/include/hw/misc/stm32l4x5_exti.h b/include/hw/misc/stm32l4x5_e= xti.h index 62f79362f28..543662c7b90 100644 --- a/include/hw/misc/stm32l4x5_exti.h +++ b/include/hw/misc/stm32l4x5_exti.h @@ -24,7 +24,7 @@ #ifndef HW_STM32L4X5_EXTI_H #define HW_STM32L4X5_EXTI_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_STM32L4X5_EXTI "stm32l4x5-exti" diff --git a/include/hw/misc/stm32l4x5_rcc.h b/include/hw/misc/stm32l4x5_rc= c.h index 0fbfba5c40b..64ead11b3d4 100644 --- a/include/hw/misc/stm32l4x5_rcc.h +++ b/include/hw/misc/stm32l4x5_rcc.h @@ -18,7 +18,7 @@ #ifndef HW_STM32L4X5_RCC_H #define HW_STM32L4X5_RCC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_STM32L4X5_RCC "stm32l4x5-rcc" diff --git a/include/hw/misc/stm32l4x5_syscfg.h b/include/hw/misc/stm32l4x5= _syscfg.h index c450df2b9ea..d83b4c07239 100644 --- a/include/hw/misc/stm32l4x5_syscfg.h +++ b/include/hw/misc/stm32l4x5_syscfg.h @@ -24,7 +24,7 @@ #ifndef HW_STM32L4X5_SYSCFG_H #define HW_STM32L4X5_SYSCFG_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "hw/gpio/stm32l4x5_gpio.h" =20 diff --git a/include/hw/misc/tz-mpc.h b/include/hw/misc/tz-mpc.h index 74d5d822cf3..bda4bc2ae3c 100644 --- a/include/hw/misc/tz-mpc.h +++ b/include/hw/misc/tz-mpc.h @@ -31,7 +31,7 @@ #ifndef TZ_MPC_H #define TZ_MPC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_TZ_MPC "tz-mpc" diff --git a/include/hw/misc/tz-msc.h b/include/hw/misc/tz-msc.h index 77cc7f24048..07112d8caa3 100644 --- a/include/hw/misc/tz-msc.h +++ b/include/hw/misc/tz-msc.h @@ -50,7 +50,7 @@ #ifndef TZ_MSC_H #define TZ_MSC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/arm/idau.h" #include "qom/object.h" =20 diff --git a/include/hw/misc/tz-ppc.h b/include/hw/misc/tz-ppc.h index 021d671b29b..3fb9401160f 100644 --- a/include/hw/misc/tz-ppc.h +++ b/include/hw/misc/tz-ppc.h @@ -65,7 +65,7 @@ #ifndef TZ_PPC_H #define TZ_PPC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_TZ_PPC "tz-ppc" diff --git a/include/hw/misc/unimp.h b/include/hw/misc/unimp.h index 904f502fab1..77a5077511f 100644 --- a/include/hw/misc/unimp.h +++ b/include/hw/misc/unimp.h @@ -9,7 +9,7 @@ #define HW_MISC_UNIMP_H =20 #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qom/object.h" =20 diff --git a/include/hw/misc/virt_ctrl.h b/include/hw/misc/virt_ctrl.h index 81346cf017e..ddce36f3b7e 100644 --- a/include/hw/misc/virt_ctrl.h +++ b/include/hw/misc/virt_ctrl.h @@ -7,7 +7,7 @@ #ifndef VIRT_CTRL_H #define VIRT_CTRL_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_VIRT_CTRL "virt-ctrl" OBJECT_DECLARE_SIMPLE_TYPE(VirtCtrlState, VIRT_CTRL) diff --git a/include/hw/misc/xlnx-versal-cframe-reg.h b/include/hw/misc/xln= x-versal-cframe-reg.h index fe8788a7453..8f5c2959a82 100644 --- a/include/hw/misc/xlnx-versal-cframe-reg.h +++ b/include/hw/misc/xlnx-versal-cframe-reg.h @@ -17,7 +17,7 @@ #ifndef HW_MISC_XLNX_VERSAL_CFRAME_REG_H #define HW_MISC_XLNX_VERSAL_CFRAME_REG_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/misc/xlnx-cfi-if.h" #include "hw/misc/xlnx-versal-cfu.h" diff --git a/include/hw/misc/xlnx-versal-cfu.h b/include/hw/misc/xlnx-versa= l-cfu.h index 3d7ca506de1..e4fefe43c00 100644 --- a/include/hw/misc/xlnx-versal-cfu.h +++ b/include/hw/misc/xlnx-versal-cfu.h @@ -17,7 +17,7 @@ #ifndef HW_MISC_XLNX_VERSAL_CFU_APB_H #define HW_MISC_XLNX_VERSAL_CFU_APB_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/misc/xlnx-cfi-if.h" #include "qemu/fifo32.h" diff --git a/include/hw/misc/xlnx-versal-crl.h b/include/hw/misc/xlnx-versa= l-crl.h index ace3d198bde..fea7768642f 100644 --- a/include/hw/misc/xlnx-versal-crl.h +++ b/include/hw/misc/xlnx-versal-crl.h @@ -10,7 +10,7 @@ #ifndef HW_MISC_XLNX_VERSAL_CRL_H #define HW_MISC_XLNX_VERSAL_CRL_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "target/arm/cpu-qom.h" #include "hw/arm/xlnx-versal-version.h" diff --git a/include/hw/misc/xlnx-versal-pmc-iou-slcr.h b/include/hw/misc/x= lnx-versal-pmc-iou-slcr.h index d8f45bd94b2..046f3e525c2 100644 --- a/include/hw/misc/xlnx-versal-pmc-iou-slcr.h +++ b/include/hw/misc/xlnx-versal-pmc-iou-slcr.h @@ -54,7 +54,7 @@ #ifndef XLNX_VERSAL_PMC_IOU_SLCR_H #define XLNX_VERSAL_PMC_IOU_SLCR_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" =20 #define TYPE_XILINX_VERSAL_PMC_IOU_SLCR "xlnx.versal-pmc-iou-slcr" diff --git a/include/hw/misc/xlnx-versal-trng.h b/include/hw/misc/xlnx-vers= al-trng.h index 8de29104048..ea6e4cb2e1a 100644 --- a/include/hw/misc/xlnx-versal-trng.h +++ b/include/hw/misc/xlnx-versal-trng.h @@ -27,7 +27,7 @@ #define XLNX_VERSAL_TRNG_H =20 #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" =20 #define TYPE_XLNX_VERSAL_TRNG "xlnx.versal-trng" diff --git a/include/hw/misc/xlnx-versal-xramc.h b/include/hw/misc/xlnx-ver= sal-xramc.h index e79941d8865..e888a9f03de 100644 --- a/include/hw/misc/xlnx-versal-xramc.h +++ b/include/hw/misc/xlnx-versal-xramc.h @@ -9,7 +9,7 @@ #ifndef XLNX_VERSAL_XRAMC_H #define XLNX_VERSAL_XRAMC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" =20 #define TYPE_XLNX_XRAM_CTRL "xlnx.versal-xramc" diff --git a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h b/include/hw/misc/xlnx-= zynqmp-apu-ctrl.h index c0315720053..cc0a531c244 100644 --- a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h +++ b/include/hw/misc/xlnx-zynqmp-apu-ctrl.h @@ -11,7 +11,7 @@ #ifndef HW_MISC_XLNX_ZYNQMP_APU_CTRL_H #define HW_MISC_XLNX_ZYNQMP_APU_CTRL_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "target/arm/cpu-qom.h" =20 diff --git a/include/hw/misc/xlnx-zynqmp-crf.h b/include/hw/misc/xlnx-zynqm= p-crf.h index df83034a988..933867a6e54 100644 --- a/include/hw/misc/xlnx-zynqmp-crf.h +++ b/include/hw/misc/xlnx-zynqmp-crf.h @@ -8,7 +8,7 @@ #ifndef HW_MISC_XLNX_ZYNQMP_CRF_H #define HW_MISC_XLNX_ZYNQMP_CRF_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" =20 #define TYPE_XLNX_ZYNQMP_CRF "xlnx.zynqmp_crf" diff --git a/include/hw/net/allwinner-sun8i-emac.h b/include/hw/net/allwinn= er-sun8i-emac.h index 185895f4e13..24662a24ac0 100644 --- a/include/hw/net/allwinner-sun8i-emac.h +++ b/include/hw/net/allwinner-sun8i-emac.h @@ -22,7 +22,7 @@ =20 #include "qom/object.h" #include "net/net.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /** * Object model diff --git a/include/hw/net/allwinner_emac.h b/include/hw/net/allwinner_ema= c.h index 534e748982f..b3482e137ee 100644 --- a/include/hw/net/allwinner_emac.h +++ b/include/hw/net/allwinner_emac.h @@ -27,7 +27,7 @@ #include "net/net.h" #include "qemu/fifo8.h" #include "hw/net/mii.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_AW_EMAC "allwinner-emac" diff --git a/include/hw/net/cadence_gem.h b/include/hw/net/cadence_gem.h index e63941f18fc..f5f1fa47c16 100644 --- a/include/hw/net/cadence_gem.h +++ b/include/hw/net/cadence_gem.h @@ -30,7 +30,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(CadenceGEMState, CADENCE_GEM) =20 #include "net/net.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define CADENCE_GEM_MAXREG (0x00000800 / 4) /* Last valid GEM addre= ss */ =20 diff --git a/include/hw/net/dp8393x.h b/include/hw/net/dp8393x.h index 24273dc1f43..5fe02d5a3c5 100644 --- a/include/hw/net/dp8393x.h +++ b/include/hw/net/dp8393x.h @@ -20,7 +20,7 @@ #ifndef HW_NET_DP8393X_H #define HW_NET_DP8393X_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "system/memory.h" =20 diff --git a/include/hw/net/ftgmac100.h b/include/hw/net/ftgmac100.h index 24ccdf0260a..414963c5fbd 100644 --- a/include/hw/net/ftgmac100.h +++ b/include/hw/net/ftgmac100.h @@ -19,7 +19,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(FTGMAC100State, FTGMAC100) #define FTGMAC100_REG_HIGH_MEM_SIZE 0x100 #define FTGMAC100_REG_HIGH_OFFSET 0x100 =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" =20 /* diff --git a/include/hw/net/imx_fec.h b/include/hw/net/imx_fec.h index 99fc285402c..f0ac7d60e14 100644 --- a/include/hw/net/imx_fec.h +++ b/include/hw/net/imx_fec.h @@ -30,7 +30,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(IMXFECState, IMX_FEC) =20 #define TYPE_IMX_ENET "imx.enet" =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/net/lan9118_phy.h" #include "hw/core/irq.h" #include "net/net.h" diff --git a/include/hw/net/lan9118_phy.h b/include/hw/net/lan9118_phy.h index af12fc33d5f..1f9ad643c7b 100644 --- a/include/hw/net/lan9118_phy.h +++ b/include/hw/net/lan9118_phy.h @@ -12,7 +12,7 @@ #define HW_NET_LAN9118_PHY_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_LAN9118_PHY "lan9118-phy" OBJECT_DECLARE_SIMPLE_TYPE(Lan9118PhyState, LAN9118_PHY) diff --git a/include/hw/net/lance.h b/include/hw/net/lance.h index f645d6af67f..be473e2eedb 100644 --- a/include/hw/net/lance.h +++ b/include/hw/net/lance.h @@ -31,7 +31,7 @@ =20 #include "net/net.h" #include "hw/net/pcnet.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_LANCE "lance" diff --git a/include/hw/net/lasi_82596.h b/include/hw/net/lasi_82596.h index c46a4a137e2..ab31874a7c5 100644 --- a/include/hw/net/lasi_82596.h +++ b/include/hw/net/lasi_82596.h @@ -10,7 +10,7 @@ =20 #include "net/net.h" #include "hw/net/i82596.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_LASI_82596 "lasi_82596" typedef struct SysBusI82596State SysBusI82596State; diff --git a/include/hw/net/msf2-emac.h b/include/hw/net/msf2-emac.h index b5d9127e46c..f018ab3ff38 100644 --- a/include/hw/net/msf2-emac.h +++ b/include/hw/net/msf2-emac.h @@ -22,7 +22,7 @@ * THE SOFTWARE. */ =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/memory.h" #include "net/net.h" #include "net/eth.h" diff --git a/include/hw/net/npcm7xx_emc.h b/include/hw/net/npcm7xx_emc.h index 03c9941d82d..238507cadce 100644 --- a/include/hw/net/npcm7xx_emc.h +++ b/include/hw/net/npcm7xx_emc.h @@ -18,7 +18,7 @@ #define NPCM7XX_EMC_H =20 #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" =20 /* 32-bit register indices. */ diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h index 44ee7b1bcba..d4fe49ada57 100644 --- a/include/hw/net/npcm_gmac.h +++ b/include/hw/net/npcm_gmac.h @@ -21,7 +21,7 @@ #define NPCM_GMAC_H =20 #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" =20 #define NPCM_GMAC_NR_REGS (0x1060 / sizeof(uint32_t)) diff --git a/include/hw/net/npcm_pcs.h b/include/hw/net/npcm_pcs.h index d5c481ad70d..7f5aa76353c 100644 --- a/include/hw/net/npcm_pcs.h +++ b/include/hw/net/npcm_pcs.h @@ -17,7 +17,7 @@ #ifndef NPCM_PCS_H #define NPCM_PCS_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define NPCM_PCS_NR_SR_CTLS (0x12 / sizeof(uint16_t)) #define NPCM_PCS_NR_SR_MIIS (0x20 / sizeof(uint16_t)) diff --git a/include/hw/net/xlnx-zynqmp-can.h b/include/hw/net/xlnx-zynqmp-= can.h index d23c1523caf..b43384a0983 100644 --- a/include/hw/net/xlnx-zynqmp-can.h +++ b/include/hw/net/xlnx-zynqmp-can.h @@ -30,7 +30,7 @@ #ifndef XLNX_ZYNQMP_CAN_H #define XLNX_ZYNQMP_CAN_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "net/can_emu.h" #include "net/can_host.h" diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h index 105ddddd0d8..52d8797053e 100644 --- a/include/hw/nubus/nubus.h +++ b/include/hw/nubus/nubus.h @@ -10,7 +10,7 @@ #define HW_NUBUS_NUBUS_H =20 #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/address-spaces.h" #include "qom/object.h" #include "qemu/units.h" diff --git a/include/hw/nvram/bcm2835_otp.h b/include/hw/nvram/bcm2835_otp.h index 1df33700bde..dba92a41e87 100644 --- a/include/hw/nvram/bcm2835_otp.h +++ b/include/hw/nvram/bcm2835_otp.h @@ -9,7 +9,7 @@ #ifndef BCM2835_OTP_H #define BCM2835_OTP_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_BCM2835_OTP "bcm2835-otp" diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index d41b9328fd1..a29a5d55eab 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -3,7 +3,7 @@ =20 #include "exec/hwaddr.h" #include "standard-headers/linux/qemu_fw_cfg.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/dma.h" #include "qom/object.h" =20 diff --git a/include/hw/nvram/mac_nvram.h b/include/hw/nvram/mac_nvram.h index e9d8398f849..e0237328225 100644 --- a/include/hw/nvram/mac_nvram.h +++ b/include/hw/nvram/mac_nvram.h @@ -27,7 +27,7 @@ #define MAC_NVRAM_H =20 #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define MACIO_NVRAM_SIZE 0x2000 =20 diff --git a/include/hw/nvram/npcm7xx_otp.h b/include/hw/nvram/npcm7xx_otp.h index 77b05f8b82c..95118c64a74 100644 --- a/include/hw/nvram/npcm7xx_otp.h +++ b/include/hw/nvram/npcm7xx_otp.h @@ -17,7 +17,7 @@ #define NPCM7XX_OTP_H =20 #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* Each OTP module holds 8192 bits of one-time programmable storage */ #define NPCM7XX_OTP_ARRAY_BITS (8192) diff --git a/include/hw/nvram/nrf51_nvm.h b/include/hw/nvram/nrf51_nvm.h index d85e788df5d..172e344a5d5 100644 --- a/include/hw/nvram/nrf51_nvm.h +++ b/include/hw/nvram/nrf51_nvm.h @@ -22,7 +22,7 @@ #ifndef NRF51_NVM_H #define NRF51_NVM_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_NRF51_NVM "nrf51_soc.nvm" OBJECT_DECLARE_SIMPLE_TYPE(NRF51NVMState, NRF51_NVM) diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h index 27423035d40..7a8dd85effd 100644 --- a/include/hw/nvram/xlnx-bbram.h +++ b/include/hw/nvram/xlnx-bbram.h @@ -29,7 +29,7 @@ #include "system/block-backend.h" #include "hw/core/qdev.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" =20 #define RMAX_XLNX_BBRAM ((0x4c / 4) + 1) diff --git a/include/hw/nvram/xlnx-versal-efuse.h b/include/hw/nvram/xlnx-v= ersal-efuse.h index 07f1000a851..b10d7483171 100644 --- a/include/hw/nvram/xlnx-versal-efuse.h +++ b/include/hw/nvram/xlnx-versal-efuse.h @@ -23,7 +23,7 @@ #define XLNX_VERSAL_EFUSE_H =20 #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/nvram/xlnx-efuse.h" =20 diff --git a/include/hw/nvram/xlnx-zynqmp-efuse.h b/include/hw/nvram/xlnx-z= ynqmp-efuse.h index d4886943860..b62f8181fd9 100644 --- a/include/hw/nvram/xlnx-zynqmp-efuse.h +++ b/include/hw/nvram/xlnx-zynqmp-efuse.h @@ -23,7 +23,7 @@ #define XLNX_ZYNQMP_EFUSE_H =20 #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/nvram/xlnx-efuse.h" =20 diff --git a/include/hw/pci-host/aspeed_pcie.h b/include/hw/pci-host/aspeed= _pcie.h index be53ea96b90..e660119a455 100644 --- a/include/hw/pci-host/aspeed_pcie.h +++ b/include/hw/pci-host/aspeed_pcie.h @@ -17,7 +17,7 @@ #ifndef ASPEED_PCIE_H #define ASPEED_PCIE_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pcie_port.h" diff --git a/include/hw/pci-host/designware.h b/include/hw/pci-host/designw= are.h index a35a3bd06c8..e82fdc5fe74 100644 --- a/include/hw/pci-host/designware.h +++ b/include/hw/pci-host/designware.h @@ -21,7 +21,7 @@ #ifndef DESIGNWARE_H #define DESIGNWARE_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_bridge.h" #include "qom/object.h" =20 diff --git a/include/hw/pci-host/fsl_imx8m_phy.h b/include/hw/pci-host/fsl_= imx8m_phy.h index 5f1b212fd97..5786534b0ef 100644 --- a/include/hw/pci-host/fsl_imx8m_phy.h +++ b/include/hw/pci-host/fsl_imx8m_phy.h @@ -9,7 +9,7 @@ #ifndef HW_PCIHOST_FSLIMX8MPCIEPHY_H #define HW_PCIHOST_FSLIMX8MPCIEPHY_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "system/memory.h" =20 diff --git a/include/hw/pci-host/gpex.h b/include/hw/pci-host/gpex.h index feaf8274740..695886dedde 100644 --- a/include/hw/pci-host/gpex.h +++ b/include/hw/pci-host/gpex.h @@ -21,7 +21,7 @@ #define HW_GPEX_H =20 #include "exec/hwaddr.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_device.h" #include "hw/pci/pcie_host.h" #include "qom/object.h" diff --git a/include/hw/pci-host/xilinx-pcie.h b/include/hw/pci-host/xilinx= -pcie.h index e1b3c1c2804..b7bab77c247 100644 --- a/include/hw/pci-host/xilinx-pcie.h +++ b/include/hw/pci-host/xilinx-pcie.h @@ -20,7 +20,7 @@ #ifndef HW_XILINX_PCIE_H #define HW_XILINX_PCIE_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pcie_host.h" #include "qom/object.h" diff --git a/include/hw/pci/pci_host.h b/include/hw/pci/pci_host.h index 954dd446fa4..d8dec0ee049 100644 --- a/include/hw/pci/pci_host.h +++ b/include/hw/pci/pci_host.h @@ -28,7 +28,7 @@ #ifndef PCI_HOST_H #define PCI_HOST_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define PCI_HOST_BYPASS_IOMMU "bypass-iommu" diff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h index 76764882453..e42805144ef 100644 --- a/include/hw/ppc/mac_dbdma.h +++ b/include/hw/ppc/mac_dbdma.h @@ -26,7 +26,7 @@ #include "system/memory.h" #include "qemu/iov.h" #include "system/dma.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 typedef struct DBDMA_io DBDMA_io; diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h index 9c6af8e2076..5856955af9a 100644 --- a/include/hw/ppc/openpic.h +++ b/include/hw/ppc/openpic.h @@ -1,7 +1,7 @@ #ifndef OPENPIC_H #define OPENPIC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/cpu.h" #include "qom/object.h" =20 diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h index a8c1968f281..24f8843a409 100644 --- a/include/hw/ppc/pnv.h +++ b/include/hw/ppc/pnv.h @@ -22,7 +22,7 @@ =20 #include "cpu.h" #include "hw/core/boards.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ipmi/ipmi.h" #include "hw/ppc/pnv_pnor.h" =20 diff --git a/include/hw/ppc/pnv_chip.h b/include/hw/ppc/pnv_chip.h index a5b8c49680d..ea47c97dd38 100644 --- a/include/hw/ppc/pnv_chip.h +++ b/include/hw/ppc/pnv_chip.h @@ -14,7 +14,7 @@ #include "hw/ppc/pnv_sbe.h" #include "hw/ppc/pnv_xive.h" #include "hw/ppc/pnv_i2c.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 OBJECT_DECLARE_TYPE(PnvChip, PnvChipClass, PNV_CHIP) diff --git a/include/hw/ppc/pnv_pnor.h b/include/hw/ppc/pnv_pnor.h index b44cafe918d..7bf737d33b4 100644 --- a/include/hw/ppc/pnv_pnor.h +++ b/include/hw/ppc/pnv_pnor.h @@ -10,7 +10,7 @@ #ifndef PPC_PNV_PNOR_H #define PPC_PNV_PNOR_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* * PNOR offset on the LPC FW address space. For now this should be 0 becau= se diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h index 8a04860aa8b..e1e1ade0ce7 100644 --- a/include/hw/ppc/pnv_psi.h +++ b/include/hw/ppc/pnv_psi.h @@ -20,7 +20,7 @@ #ifndef PPC_PNV_PSI_H #define PPC_PNV_PSI_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ppc/xics.h" #include "hw/ppc/xive.h" #include "hw/core/qdev.h" diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h index 2e94b006730..b76bf091cfa 100644 --- a/include/hw/ppc/ppc4xx.h +++ b/include/hw/ppc/ppc4xx.h @@ -27,7 +27,7 @@ =20 #include "hw/ppc/ppc.h" #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* * Generic DCR device diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index b7ca8544e43..e98d011998f 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -139,7 +139,7 @@ #define PPC_XIVE_H =20 #include "system/kvm.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ppc/xive_regs.h" #include "qom/object.h" =20 diff --git a/include/hw/ppc/xive2.h b/include/hw/ppc/xive2.h index f4437e2c79a..9e2af8d8b17 100644 --- a/include/hw/ppc/xive2.h +++ b/include/hw/ppc/xive2.h @@ -11,7 +11,7 @@ =20 #include "hw/ppc/xive.h" #include "hw/ppc/xive2_regs.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* * XIVE2 Router (POWER10) diff --git a/include/hw/riscv/numa.h b/include/hw/riscv/numa.h index 2d9c41ba818..e68ce8e8afd 100644 --- a/include/hw/riscv/numa.h +++ b/include/hw/riscv/numa.h @@ -20,7 +20,7 @@ #define RISCV_NUMA_H =20 #include "hw/core/boards.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/numa.h" =20 /** diff --git a/include/hw/riscv/riscv_hart.h b/include/hw/riscv/riscv_hart.h index a6ed73a1956..197fa162311 100644 --- a/include/hw/riscv/riscv_hart.h +++ b/include/hw/riscv/riscv_hart.h @@ -21,7 +21,7 @@ #ifndef HW_RISCV_HART_H #define HW_RISCV_HART_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/riscv/cpu.h" #include "qom/object.h" =20 diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h index acd41e90583..68689768841 100644 --- a/include/hw/riscv/spike.h +++ b/include/hw/riscv/spike.h @@ -21,7 +21,7 @@ =20 #include "hw/core/boards.h" #include "hw/riscv/riscv_hart.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define SPIKE_CPUS_MAX 8 #define SPIKE_SOCKETS_MAX 8 diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 806b78cc639..18a2a323a34 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -21,7 +21,7 @@ =20 #include "hw/core/boards.h" #include "hw/riscv/riscv_hart.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/block/flash.h" #include "hw/intc/riscv_imsic.h" =20 diff --git a/include/hw/rtc/allwinner-rtc.h b/include/hw/rtc/allwinner-rtc.h index bf415431cd7..2b5ff065665 100644 --- a/include/hw/rtc/allwinner-rtc.h +++ b/include/hw/rtc/allwinner-rtc.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_RTC_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /** * Constants diff --git a/include/hw/rtc/aspeed_rtc.h b/include/hw/rtc/aspeed_rtc.h index 596dfebb46c..ef37dd3d69f 100644 --- a/include/hw/rtc/aspeed_rtc.h +++ b/include/hw/rtc/aspeed_rtc.h @@ -8,7 +8,7 @@ #ifndef HW_RTC_ASPEED_RTC_H #define HW_RTC_ASPEED_RTC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 struct AspeedRtcState { diff --git a/include/hw/rtc/goldfish_rtc.h b/include/hw/rtc/goldfish_rtc.h index 162be338636..55ed9c4085c 100644 --- a/include/hw/rtc/goldfish_rtc.h +++ b/include/hw/rtc/goldfish_rtc.h @@ -22,7 +22,7 @@ #ifndef HW_RTC_GOLDFISH_RTC_H #define HW_RTC_GOLDFISH_RTC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_GOLDFISH_RTC "goldfish_rtc" diff --git a/include/hw/rtc/pl031.h b/include/hw/rtc/pl031.h index 9fd4be1abba..c8b26c2f00e 100644 --- a/include/hw/rtc/pl031.h +++ b/include/hw/rtc/pl031.h @@ -14,7 +14,7 @@ #ifndef HW_RTC_PL031_H #define HW_RTC_PL031_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" =20 diff --git a/include/hw/rtc/xlnx-zynqmp-rtc.h b/include/hw/rtc/xlnx-zynqmp-= rtc.h index a542b87cb89..7d8505ce399 100644 --- a/include/hw/rtc/xlnx-zynqmp-rtc.h +++ b/include/hw/rtc/xlnx-zynqmp-rtc.h @@ -28,7 +28,7 @@ #define HW_RTC_XLNX_ZYNQMP_RTC_H =20 #include "hw/core/register.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_XLNX_ZYNQMP_RTC "xlnx-zynmp.rtc" diff --git a/include/hw/s390x/3270-ccw.h b/include/hw/s390x/3270-ccw.h index 14398822944..6b73c8b51f8 100644 --- a/include/hw/s390x/3270-ccw.h +++ b/include/hw/s390x/3270-ccw.h @@ -13,7 +13,7 @@ #ifndef HW_S390X_3270_CCW_H #define HW_S390X_3270_CCW_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/s390x/css.h" #include "hw/s390x/ccw-device.h" #include "qom/object.h" diff --git a/include/hw/s390x/css-bridge.h b/include/hw/s390x/css-bridge.h index 4f874ed781b..1a29d3a542d 100644 --- a/include/hw/s390x/css-bridge.h +++ b/include/hw/s390x/css-bridge.h @@ -14,7 +14,7 @@ #define HW_S390X_CSS_BRIDGE_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* virtual css bridge */ struct VirtualCssBridge { diff --git a/include/hw/s390x/s390_flic.h b/include/hw/s390x/s390_flic.h index 91edaaca409..c9db5279e3a 100644 --- a/include/hw/s390x/s390_flic.h +++ b/include/hw/s390x/s390_flic.h @@ -13,7 +13,7 @@ #ifndef HW_S390_FLIC_H #define HW_S390_FLIC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/s390x/adapter.h" #include "hw/virtio/virtio.h" #include "qemu/queue.h" diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index 33f01f85bb1..ddc61f1c214 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -14,7 +14,7 @@ #ifndef HW_S390_SCLP_H #define HW_S390_SCLP_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/s390x/cpu-qom.h" #include "qom/object.h" =20 diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h index 3526bad7464..8887ba85124 100644 --- a/include/hw/scsi/esp.h +++ b/include/hw/scsi/esp.h @@ -2,7 +2,7 @@ #define QEMU_HW_ESP_H =20 #include "hw/scsi/scsi.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/fifo8.h" #include "qom/object.h" =20 diff --git a/include/hw/sd/allwinner-sdhost.h b/include/hw/sd/allwinner-sdh= ost.h index 1b951177dda..d154d81d24c 100644 --- a/include/hw/sd/allwinner-sdhost.h +++ b/include/hw/sd/allwinner-sdhost.h @@ -21,7 +21,7 @@ #define HW_SD_ALLWINNER_SDHOST_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sd/sd.h" =20 /** diff --git a/include/hw/sd/bcm2835_sdhost.h b/include/hw/sd/bcm2835_sdhost.h index f6bca5c3979..8ba220d89e9 100644 --- a/include/hw/sd/bcm2835_sdhost.h +++ b/include/hw/sd/bcm2835_sdhost.h @@ -14,7 +14,7 @@ #ifndef BCM2835_SDHOST_H #define BCM2835_SDHOST_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sd/sd.h" #include "qom/object.h" =20 diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 51fb30ea528..32962c210d7 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -26,7 +26,7 @@ #define SDHCI_H =20 #include "hw/pci/pci_device.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sd/sd.h" #include "qom/object.h" =20 diff --git a/include/hw/sparc/sparc32_dma.h b/include/hw/sparc/sparc32_dma.h index cde8ec02cb6..3181c17043a 100644 --- a/include/hw/sparc/sparc32_dma.h +++ b/include/hw/sparc/sparc32_dma.h @@ -1,7 +1,7 @@ #ifndef SPARC32_DMA_H #define SPARC32_DMA_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/scsi/esp.h" #include "hw/net/lance.h" #include "qom/object.h" diff --git a/include/hw/sparc/sun4m_iommu.h b/include/hw/sparc/sun4m_iommu.h index 4e2ab34cdef..ccefafedbc4 100644 --- a/include/hw/sparc/sun4m_iommu.h +++ b/include/hw/sparc/sun4m_iommu.h @@ -25,7 +25,7 @@ #ifndef SUN4M_IOMMU_H #define SUN4M_IOMMU_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define IOMMU_NREGS (4 * 4096 / 4) diff --git a/include/hw/sparc/sun4u_iommu.h b/include/hw/sparc/sun4u_iommu.h index f94566a72c9..3ae81a2406a 100644 --- a/include/hw/sparc/sun4u_iommu.h +++ b/include/hw/sparc/sun4u_iommu.h @@ -27,7 +27,7 @@ #ifndef SUN4U_IOMMU_H #define SUN4U_IOMMU_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define IOMMU_NREGS 3 diff --git a/include/hw/ssi/allwinner-a10-spi.h b/include/hw/ssi/allwinner-= a10-spi.h index da46e29a278..6e0e2993615 100644 --- a/include/hw/ssi/allwinner-a10-spi.h +++ b/include/hw/ssi/allwinner-a10-spi.h @@ -23,7 +23,7 @@ #define ALLWINNER_A10_SPI_H =20 #include "hw/ssi/ssi.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/fifo8.h" #include "qom/object.h" =20 diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h index 25b95e74060..76831422c6f 100644 --- a/include/hw/ssi/aspeed_smc.h +++ b/include/hw/ssi/aspeed_smc.h @@ -26,7 +26,7 @@ #define ASPEED_SMC_H =20 #include "hw/ssi/ssi.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 struct AspeedSMCState; diff --git a/include/hw/ssi/bcm2835_spi.h b/include/hw/ssi/bcm2835_spi.h index d3f8cec1119..d5891fd9257 100644 --- a/include/hw/ssi/bcm2835_spi.h +++ b/include/hw/ssi/bcm2835_spi.h @@ -22,7 +22,7 @@ * THE SOFTWARE. */ =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ssi/ssi.h" #include "qom/object.h" #include "qemu/fifo8.h" diff --git a/include/hw/ssi/ibex_spi_host.h b/include/hw/ssi/ibex_spi_host.h index 5bd5557b9a1..2aac6ee920c 100644 --- a/include/hw/ssi/ibex_spi_host.h +++ b/include/hw/ssi/ibex_spi_host.h @@ -27,7 +27,7 @@ #ifndef IBEX_SPI_HOST_H #define IBEX_SPI_HOST_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ssi/ssi.h" #include "qemu/fifo8.h" #include "qom/object.h" diff --git a/include/hw/ssi/imx_spi.h b/include/hw/ssi/imx_spi.h index eeaf49bbac3..9a95127755f 100644 --- a/include/hw/ssi/imx_spi.h +++ b/include/hw/ssi/imx_spi.h @@ -10,7 +10,7 @@ #ifndef IMX_SPI_H #define IMX_SPI_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ssi/ssi.h" #include "qemu/bitops.h" #include "qemu/fifo32.h" diff --git a/include/hw/ssi/mss-spi.h b/include/hw/ssi/mss-spi.h index ce6279c4310..85e11f72669 100644 --- a/include/hw/ssi/mss-spi.h +++ b/include/hw/ssi/mss-spi.h @@ -25,7 +25,7 @@ #ifndef HW_MSS_SPI_H #define HW_MSS_SPI_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ssi/ssi.h" #include "qemu/fifo32.h" #include "qom/object.h" diff --git a/include/hw/ssi/npcm7xx_fiu.h b/include/hw/ssi/npcm7xx_fiu.h index 7ebd422ca6c..530d8e2f44a 100644 --- a/include/hw/ssi/npcm7xx_fiu.h +++ b/include/hw/ssi/npcm7xx_fiu.h @@ -17,7 +17,7 @@ #define NPCM7XX_FIU_H =20 #include "hw/ssi/ssi.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* * Number of registers in our device state structure. Don't change this wi= thout diff --git a/include/hw/ssi/npcm_pspi.h b/include/hw/ssi/npcm_pspi.h index 37cc784d962..dbf40710f32 100644 --- a/include/hw/ssi/npcm_pspi.h +++ b/include/hw/ssi/npcm_pspi.h @@ -17,7 +17,7 @@ #define NPCM_PSPI_H =20 #include "hw/ssi/ssi.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* * Number of registers in our device state structure. Don't change this wi= thout diff --git a/include/hw/ssi/pl022.h b/include/hw/ssi/pl022.h index 25d58db5f32..afddc314c79 100644 --- a/include/hw/ssi/pl022.h +++ b/include/hw/ssi/pl022.h @@ -22,7 +22,7 @@ #ifndef HW_SSI_PL022_H #define HW_SSI_PL022_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_PL022 "pl022" diff --git a/include/hw/ssi/pnv_spi.h b/include/hw/ssi/pnv_spi.h index c591a0663da..31a690854ba 100644 --- a/include/hw/ssi/pnv_spi.h +++ b/include/hw/ssi/pnv_spi.h @@ -22,7 +22,7 @@ #define PPC_PNV_SPI_H =20 #include "hw/ssi/ssi.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/fifo8.h" =20 #define TYPE_PNV_SPI "pnv-spi" diff --git a/include/hw/ssi/sifive_spi.h b/include/hw/ssi/sifive_spi.h index d0c40cdb11b..e45becb8c59 100644 --- a/include/hw/ssi/sifive_spi.h +++ b/include/hw/ssi/sifive_spi.h @@ -23,7 +23,7 @@ #define HW_SIFIVE_SPI_H =20 #include "qemu/fifo8.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define SIFIVE_SPI_REG_NUM (0x78 / 4) =20 diff --git a/include/hw/ssi/stm32f2xx_spi.h b/include/hw/ssi/stm32f2xx_spi.h index 3683b4ad329..26b02429aaa 100644 --- a/include/hw/ssi/stm32f2xx_spi.h +++ b/include/hw/ssi/stm32f2xx_spi.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F2XX_SPI_H #define HW_STM32F2XX_SPI_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ssi/ssi.h" #include "qom/object.h" =20 diff --git a/include/hw/ssi/xilinx_spips.h b/include/hw/ssi/xilinx_spips.h index 56cf69a37d2..c8f6c5053c4 100644 --- a/include/hw/ssi/xilinx_spips.h +++ b/include/hw/ssi/xilinx_spips.h @@ -28,7 +28,7 @@ #include "hw/ssi/ssi.h" #include "qemu/fifo32.h" #include "hw/core/stream.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 typedef struct XilinxSPIPS XilinxSPIPS; diff --git a/include/hw/timer/a9gtimer.h b/include/hw/timer/a9gtimer.h index 6ae9122e4b6..5c9b048b954 100644 --- a/include/hw/timer/a9gtimer.h +++ b/include/hw/timer/a9gtimer.h @@ -23,7 +23,7 @@ #ifndef A9GTIMER_H #define A9GTIMER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define A9_GTIMER_MAX_CPUS 4 diff --git a/include/hw/timer/allwinner-a10-pit.h b/include/hw/timer/allwin= ner-a10-pit.h index 623a1fec219..fe6a408022e 100644 --- a/include/hw/timer/allwinner-a10-pit.h +++ b/include/hw/timer/allwinner-a10-pit.h @@ -2,7 +2,7 @@ #define ALLWINNER_A10_PIT_H =20 #include "hw/core/ptimer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_AW_A10_PIT "allwinner-A10-timer" diff --git a/include/hw/timer/arm_mptimer.h b/include/hw/timer/arm_mptimer.h index 65a96e2a0dc..4c6f5696319 100644 --- a/include/hw/timer/arm_mptimer.h +++ b/include/hw/timer/arm_mptimer.h @@ -21,7 +21,7 @@ #ifndef HW_TIMER_ARM_MPTIMER_H #define HW_TIMER_ARM_MPTIMER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define ARM_MPTIMER_MAX_CPUS 4 diff --git a/include/hw/timer/armv7m_systick.h b/include/hw/timer/armv7m_sy= stick.h index fb73f78a7b8..637dbf35c5c 100644 --- a/include/hw/timer/armv7m_systick.h +++ b/include/hw/timer/armv7m_systick.h @@ -12,7 +12,7 @@ #ifndef HW_TIMER_ARMV7M_SYSTICK_H #define HW_TIMER_ARMV7M_SYSTICK_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "hw/core/ptimer.h" #include "hw/core/clock.h" diff --git a/include/hw/timer/avr_timer16.h b/include/hw/timer/avr_timer16.h index a1a032a24dc..5c9dca134a0 100644 --- a/include/hw/timer/avr_timer16.h +++ b/include/hw/timer/avr_timer16.h @@ -28,7 +28,7 @@ #ifndef HW_TIMER_AVR_TIMER16_H #define HW_TIMER_AVR_TIMER16_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" =20 diff --git a/include/hw/timer/bcm2835_systmr.h b/include/hw/timer/bcm2835_s= ystmr.h index 93cb3415a68..0674a18f12d 100644 --- a/include/hw/timer/bcm2835_systmr.h +++ b/include/hw/timer/bcm2835_systmr.h @@ -9,7 +9,7 @@ #ifndef BCM2835_SYSTMR_H #define BCM2835_SYSTMR_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "qemu/timer.h" #include "qom/object.h" diff --git a/include/hw/timer/cadence_ttc.h b/include/hw/timer/cadence_ttc.h index e1251383f2a..27b555e96a4 100644 --- a/include/hw/timer/cadence_ttc.h +++ b/include/hw/timer/cadence_ttc.h @@ -18,7 +18,7 @@ #ifndef HW_TIMER_CADENCE_TTC_H #define HW_TIMER_CADENCE_TTC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" =20 typedef struct { diff --git a/include/hw/timer/cmsdk-apb-dualtimer.h b/include/hw/timer/cmsd= k-apb-dualtimer.h index 103ac228815..7e238f04dfe 100644 --- a/include/hw/timer/cmsdk-apb-dualtimer.h +++ b/include/hw/timer/cmsdk-apb-dualtimer.h @@ -26,7 +26,7 @@ #ifndef CMSDK_APB_DUALTIMER_H #define CMSDK_APB_DUALTIMER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "hw/core/clock.h" #include "qom/object.h" diff --git a/include/hw/timer/cmsdk-apb-timer.h b/include/hw/timer/cmsdk-ap= b-timer.h index f8c8fb8ce55..5ecda01776e 100644 --- a/include/hw/timer/cmsdk-apb-timer.h +++ b/include/hw/timer/cmsdk-apb-timer.h @@ -12,7 +12,7 @@ #ifndef CMSDK_APB_TIMER_H #define CMSDK_APB_TIMER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "hw/core/clock.h" #include "qom/object.h" diff --git a/include/hw/timer/digic-timer.h b/include/hw/timer/digic-timer.h index f62242eaad3..bcd80108a2b 100644 --- a/include/hw/timer/digic-timer.h +++ b/include/hw/timer/digic-timer.h @@ -18,7 +18,7 @@ #ifndef HW_TIMER_DIGIC_TIMER_H #define HW_TIMER_DIGIC_TIMER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "qom/object.h" =20 diff --git a/include/hw/timer/ibex_timer.h b/include/hw/timer/ibex_timer.h index 41f5c82a920..53055f3351b 100644 --- a/include/hw/timer/ibex_timer.h +++ b/include/hw/timer/ibex_timer.h @@ -25,7 +25,7 @@ #ifndef HW_IBEX_TIMER_H #define HW_IBEX_TIMER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_IBEX_TIMER "ibex-timer" OBJECT_DECLARE_SIMPLE_TYPE(IbexTimerState, IBEX_TIMER) diff --git a/include/hw/timer/imx_epit.h b/include/hw/timer/imx_epit.h index 2947fad1069..18d41ec1393 100644 --- a/include/hw/timer/imx_epit.h +++ b/include/hw/timer/imx_epit.h @@ -29,7 +29,7 @@ #ifndef IMX_EPIT_H #define IMX_EPIT_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "hw/misc/imx_ccm.h" #include "qom/object.h" diff --git a/include/hw/timer/imx_gpt.h b/include/hw/timer/imx_gpt.h index 5c12f686e1b..7f0d55b3499 100644 --- a/include/hw/timer/imx_gpt.h +++ b/include/hw/timer/imx_gpt.h @@ -29,7 +29,7 @@ #ifndef IMX_GPT_H #define IMX_GPT_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "hw/misc/imx_ccm.h" #include "qom/object.h" diff --git a/include/hw/timer/mss-timer.h b/include/hw/timer/mss-timer.h index 0cc376f945f..93a73fae72a 100644 --- a/include/hw/timer/mss-timer.h +++ b/include/hw/timer/mss-timer.h @@ -25,7 +25,7 @@ #ifndef HW_MSS_TIMER_H #define HW_MSS_TIMER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "qom/object.h" =20 diff --git a/include/hw/timer/npcm7xx_timer.h b/include/hw/timer/npcm7xx_ti= mer.h index e287375dce6..9ad42c65a8a 100644 --- a/include/hw/timer/npcm7xx_timer.h +++ b/include/hw/timer/npcm7xx_timer.h @@ -17,7 +17,7 @@ #define NPCM7XX_TIMER_H =20 #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" =20 /* Each Timer Module (TIM) instance holds five 25 MHz timers. */ diff --git a/include/hw/timer/nrf51_timer.h b/include/hw/timer/nrf51_timer.h index 76827c11dc7..fe282ff78fd 100644 --- a/include/hw/timer/nrf51_timer.h +++ b/include/hw/timer/nrf51_timer.h @@ -13,7 +13,7 @@ #ifndef NRF51_TIMER_H #define NRF51_TIMER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" #define TYPE_NRF51_TIMER "nrf51_soc.timer" diff --git a/include/hw/timer/renesas_cmt.h b/include/hw/timer/renesas_cmt.h index 1c0b65c1d5a..e2aa6d47af5 100644 --- a/include/hw/timer/renesas_cmt.h +++ b/include/hw/timer/renesas_cmt.h @@ -10,7 +10,7 @@ #define HW_TIMER_RENESAS_CMT_H =20 #include "qemu/timer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_RENESAS_CMT "renesas-cmt" diff --git a/include/hw/timer/renesas_tmr.h b/include/hw/timer/renesas_tmr.h index caf7eec0dca..061b8f2900a 100644 --- a/include/hw/timer/renesas_tmr.h +++ b/include/hw/timer/renesas_tmr.h @@ -10,7 +10,7 @@ #define HW_TIMER_RENESAS_TMR_H =20 #include "qemu/timer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_RENESAS_TMR "renesas-tmr" diff --git a/include/hw/timer/sifive_pwm.h b/include/hw/timer/sifive_pwm.h index 6a8cf7b29e4..d3a49be6b6a 100644 --- a/include/hw/timer/sifive_pwm.h +++ b/include/hw/timer/sifive_pwm.h @@ -27,7 +27,7 @@ #ifndef HW_SIFIVE_PWM_H #define HW_SIFIVE_PWM_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" =20 diff --git a/include/hw/timer/sse-counter.h b/include/hw/timer/sse-counter.h index b433e58d370..15bd1a51047 100644 --- a/include/hw/timer/sse-counter.h +++ b/include/hw/timer/sse-counter.h @@ -30,7 +30,7 @@ #ifndef SSE_COUNTER_H #define SSE_COUNTER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "qemu/notify.h" =20 diff --git a/include/hw/timer/sse-timer.h b/include/hw/timer/sse-timer.h index 265ad32400d..c9ad2225a63 100644 --- a/include/hw/timer/sse-timer.h +++ b/include/hw/timer/sse-timer.h @@ -24,7 +24,7 @@ #ifndef SSE_TIMER_H #define SSE_TIMER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" #include "hw/timer/sse-counter.h" diff --git a/include/hw/timer/stellaris-gptm.h b/include/hw/timer/stellaris= -gptm.h index 9d663b58dfa..824723b2730 100644 --- a/include/hw/timer/stellaris-gptm.h +++ b/include/hw/timer/stellaris-gptm.h @@ -11,7 +11,7 @@ #define HW_TIMER_STELLARIS_GPTM_H =20 #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/clock.h" =20 diff --git a/include/hw/timer/stm32f2xx_timer.h b/include/hw/timer/stm32f2x= x_timer.h index 90f40f1746f..040e64d4992 100644 --- a/include/hw/timer/stm32f2xx_timer.h +++ b/include/hw/timer/stm32f2xx_timer.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F2XX_TIMER_H #define HW_STM32F2XX_TIMER_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" =20 diff --git a/include/hw/tricore/tc27x_soc.h b/include/hw/tricore/tc27x_soc.h index dd3a7485c85..2d2bdca3fd2 100644 --- a/include/hw/tricore/tc27x_soc.h +++ b/include/hw/tricore/tc27x_soc.h @@ -21,7 +21,7 @@ #ifndef TC27X_SOC_H #define TC27X_SOC_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/tricore/cpu.h" #include "qom/object.h" =20 diff --git a/include/hw/tricore/tricore_testdevice.h b/include/hw/tricore/t= ricore_testdevice.h index 2c57b62f222..98c87ba76be 100644 --- a/include/hw/tricore/tricore_testdevice.h +++ b/include/hw/tricore/tricore_testdevice.h @@ -18,7 +18,7 @@ #ifndef HW_TRICORE_TESTDEVICE_H #define HW_TRICORE_TESTDEVICE_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_TRICORE_TESTDEVICE "tricore_testdevice" #define TRICORE_TESTDEVICE(obj) \ diff --git a/include/hw/usb/imx-usb-phy.h b/include/hw/usb/imx-usb-phy.h index d1e867b77a3..1b45b6e62a5 100644 --- a/include/hw/usb/imx-usb-phy.h +++ b/include/hw/usb/imx-usb-phy.h @@ -1,7 +1,7 @@ #ifndef IMX_USB_PHY_H #define IMX_USB_PHY_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/bitops.h" #include "qom/object.h" =20 diff --git a/include/hw/usb/xlnx-usb-subsystem.h b/include/hw/usb/xlnx-usb-= subsystem.h index b22e5d065be..e78ca743d34 100644 --- a/include/hw/usb/xlnx-usb-subsystem.h +++ b/include/hw/usb/xlnx-usb-subsystem.h @@ -26,7 +26,7 @@ #define XLNX_USB_SUBSYSTEM_H =20 #include "hw/core/register.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/usb/xlnx-versal-usb2-ctrl-regs.h" #include "hw/usb/hcd-dwc3.h" =20 diff --git a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h b/include/hw/usb/x= lnx-versal-usb2-ctrl-regs.h index c1470da4758..a8575ad6696 100644 --- a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h +++ b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h @@ -27,7 +27,7 @@ #define XLNX_VERSAL_USB2_CTRL_REGS_H =20 #include "hw/core/register.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs" =20 diff --git a/include/hw/virtio/virtio-mmio.h b/include/hw/virtio/virtio-mmi= o.h index aa492620228..1eab3c0dece 100644 --- a/include/hw/virtio/virtio-mmio.h +++ b/include/hw/virtio/virtio-mmio.h @@ -22,7 +22,7 @@ #ifndef HW_VIRTIO_MMIO_H #define HW_VIRTIO_MMIO_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/virtio/virtio-bus.h" =20 /* QOM macros */ diff --git a/include/hw/watchdog/allwinner-wdt.h b/include/hw/watchdog/allw= inner-wdt.h index 6f84dbd1a72..e6da42a9f78 100644 --- a/include/hw/watchdog/allwinner-wdt.h +++ b/include/hw/watchdog/allwinner-wdt.h @@ -25,7 +25,7 @@ =20 #include "qom/object.h" #include "hw/core/ptimer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* * This is a model of the Allwinner watchdog. diff --git a/include/hw/watchdog/cmsdk-apb-watchdog.h b/include/hw/watchdog= /cmsdk-apb-watchdog.h index 9bf95ba06d5..1c7de639993 100644 --- a/include/hw/watchdog/cmsdk-apb-watchdog.h +++ b/include/hw/watchdog/cmsdk-apb-watchdog.h @@ -31,7 +31,7 @@ #ifndef CMSDK_APB_WATCHDOG_H #define CMSDK_APB_WATCHDOG_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "hw/core/clock.h" #include "qom/object.h" diff --git a/include/hw/watchdog/sbsa_gwdt.h b/include/hw/watchdog/sbsa_gwd= t.h index ace8fe04c87..307a4f291a3 100644 --- a/include/hw/watchdog/sbsa_gwdt.h +++ b/include/hw/watchdog/sbsa_gwdt.h @@ -13,7 +13,7 @@ #define WDT_SBSA_GWDT_H =20 #include "qemu/bitops.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" =20 #define TYPE_WDT_SBSA "sbsa_gwdt" diff --git a/include/hw/watchdog/wdt_aspeed.h b/include/hw/watchdog/wdt_asp= eed.h index 830b0a79368..ecf20fbb4ea 100644 --- a/include/hw/watchdog/wdt_aspeed.h +++ b/include/hw/watchdog/wdt_aspeed.h @@ -11,7 +11,7 @@ #define WDT_ASPEED_H =20 #include "hw/misc/aspeed_scu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define TYPE_ASPEED_WDT "aspeed.wdt" diff --git a/include/hw/watchdog/wdt_imx2.h b/include/hw/watchdog/wdt_imx2.h index 53a8360e906..ad36b8820d8 100644 --- a/include/hw/watchdog/wdt_imx2.h +++ b/include/hw/watchdog/wdt_imx2.h @@ -13,7 +13,7 @@ #define WDT_IMX2_H =20 #include "qemu/bitops.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" #include "qom/object.h" diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h index 629bec90d09..232c496008c 100644 --- a/include/hw/xen/xen_pvdev.h +++ b/include/hw/xen/xen_pvdev.h @@ -1,7 +1,7 @@ #ifndef QEMU_HW_XEN_PVDEV_H #define QEMU_HW_XEN_PVDEV_H =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen_backend_ops.h" =20 /* ------------------------------------------------------------- */ diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h index f6b34161a68..8278738f3d8 100644 --- a/rust/hw/core/wrapper.h +++ b/rust/hw/core/wrapper.h @@ -24,7 +24,7 @@ typedef enum memory_order { =20 #include "qemu/osdep.h" =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" diff --git a/hw/acpi/cxl.c b/hw/acpi/cxl.c index 75d5b30bb8b..75edb2c0a65 100644 --- a/hw/acpi/cxl.c +++ b/hw/acpi/cxl.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" #include "hw/cxl/cxl.h" diff --git a/hw/adc/stm32f2xx_adc.c b/hw/adc/stm32f2xx_adc.c index a490ae640d9..50a04a0722f 100644 --- a/hw/adc/stm32f2xx_adc.c +++ b/hw/adc/stm32f2xx_adc.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index d7508ee0ecd..66f30757dd5 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -20,7 +20,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/char/serial-mm.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/allwinner-a10.h" #include "hw/misc/unimp.h" #include "system/system.h" diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index 757c89ef39f..262e99b3f9a 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "qemu/units.h" #include "hw/core/qdev.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/char/serial-mm.h" #include "hw/misc/unimp.h" #include "hw/usb/hcd-ehci.h" diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c index 396e886af47..a1ae75deb6b 100644 --- a/hw/arm/allwinner-r40.c +++ b/hw/arm/allwinner-r40.c @@ -24,7 +24,7 @@ #include "qemu/units.h" #include "hw/core/boards.h" #include "hw/core/qdev.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/char/serial-mm.h" #include "hw/misc/unimp.h" #include "hw/usb/hcd-ehci.h" diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index b6fc95df3b6..ddb210c8957 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -16,7 +16,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/arm/armsse.h" diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 844d620286c..a29eab6c915 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/arm/armv7m.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/core/loader.h" #include "hw/core/qdev-properties.h" diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index cd61ba15054..ee2f44debd1 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "hw/arm/bcm2836.h" #include "hw/arm/raspi_platform.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" =20 diff --git a/hw/arm/bcm2838.c b/hw/arm/bcm2838.c index 22aa754613c..c14a8540465 100644 --- a/hw/arm/bcm2838.c +++ b/hw/arm/bcm2838.c @@ -10,7 +10,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/arm/raspi_platform.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/bcm2838.h" #include "trace.h" =20 diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 73c40bc57da..91f0a94b6ff 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/cutils.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/boards.h" #include "strongarm.h" #include "hw/arm/boot.h" diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 5d68579cd6b..25c385ba1f5 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -29,7 +29,7 @@ #include "hw/core/irq.h" #include "system/blockdev.h" #include "system/system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/core/loader.h" #include "hw/core/qdev-properties.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index e8c171f40a8..1b8c9b618f8 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -25,7 +25,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index b8c1256328d..92d497999c0 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/datadir.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index b24df11db92..118808f2dc7 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/boards.h" #include "hw/arm/boot.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 39e8f69cae0..250fdb49b6f 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index a4ccfa373a6..8d8ea71da43 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/boot.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" #include "qemu/log.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index fcba6eb52d5..f3d6be1e295 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -38,7 +38,7 @@ #include "system/runstate.h" #include "system/rtc.h" #include "qemu/range.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/cutils.h" #include "qemu/bcd.h" #include "target/arm/cpu-qom.h" diff --git a/hw/arm/realview.c b/hw/arm/realview.c index d7f96b9d3e4..c9558be4d45 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index e12a64a20fb..985dfb345f2 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/bitops.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index f3e8e15de81..56ecc828f4f 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -11,7 +11,7 @@ #include "qemu/bitops.h" #include "qapi/error.h" #include "hw/core/split-irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sd/sd.h" #include "hw/ssi/ssi.h" #include "hw/arm/boot.h" diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index acc75476c34..5a3242195ab 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -31,7 +31,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "strongarm.h" #include "qemu/error-report.h" diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 94661b83d00..254b1610b39 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 75cb77da828..cc6ae7d4c48 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/datadir.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d8773cb541f..fd0e28f030a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -34,7 +34,7 @@ #include "qemu/option.h" #include "qemu/target-info.h" #include "monitor/qdev.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" #include "hw/arm/virt.h" diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 0d9c01e4b78..d43f36b7189 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "net/net.h" diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index e82ac8e3538..2b04513ba2e 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -17,7 +17,7 @@ #include "system/address-spaces.h" #include "hw/block/flash.h" #include "hw/core/boards.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/fdt.h" #include "hw/arm/xlnx-versal.h" #include "hw/arm/boot.h" diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index a0b2f18b551..facf92b45cc 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -15,7 +15,7 @@ #include "qapi/error.h" #include "qobject/qlist.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "system/system.h" #include "hw/misc/unimp.h" diff --git a/hw/audio/asc.c b/hw/audio/asc.c index 77a5cc1092d..a934c2e82c0 100644 --- a/hw/audio/asc.c +++ b/hw/audio/asc.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qemu/timer.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "qemu/audio.h" #include "hw/audio/asc.h" diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c index 97cceb44d86..bcf98160ec3 100644 --- a/hw/audio/cs4231.c +++ b/hw/audio/cs4231.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index 39f4b4514dc..6d5e99123d6 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c index 117b6b0ae65..4a9b8ad65ce 100644 --- a/hw/audio/pl041.c +++ b/hw/audio/pl041.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" =20 diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c index b185295d551..280f613af3a 100644 --- a/hw/avr/atmega.c +++ b/hw/avr/atmega.c @@ -17,7 +17,7 @@ #include "system/address-spaces.h" #include "system/system.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "hw/misc/unimp.h" #include "migration/vmstate.h" diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c index 956860ab298..ab57dfd83ea 100644 --- a/hw/block/fdc-sysbus.c +++ b/hw/block/fdc-sysbus.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "qom/object.h" #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/block/fdc.h" #include "migration/vmstate.h" #include "fdc-internal.h" diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index d1673a1b411..c0f5b9d8fad 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -48,7 +48,7 @@ #include "qemu/host-utils.h" #include "qemu/log.h" #include "qemu/option.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "system/blockdev.h" #include "system/runstate.h" diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 423516cb301..6f952fe7de0 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -44,7 +44,7 @@ #include "system/block-backend.h" #include "qemu/host-utils.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "trace.h" =20 diff --git a/hw/block/swim.c b/hw/block/swim.c index 53ba7fa59cf..54b63bfbb52 100644 --- a/hw/block/swim.c +++ b/hw/block/swim.c @@ -14,7 +14,7 @@ #include "qemu/main-loop.h" #include "qapi/error.h" #include "system/block-backend.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/block/block.h" #include "hw/block/swim.h" diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index c24ece5fe88..eff6a3c4d17 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -22,7 +22,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "chardev/char-fe.h" #include "chardev/char-serial.h" diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c index 1a83e4a9bd1..bf891081dcc 100644 --- a/hw/char/cmsdk-apb-uart.c +++ b/hw/char/cmsdk-apb-uart.c @@ -20,7 +20,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "chardev/char-fe.h" diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c index 8a704dfcf50..bd669173f01 100644 --- a/hw/char/digic-uart.c +++ b/hw/char/digic-uart.c @@ -27,7 +27,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "chardev/char-fe.h" #include "qemu/log.h" diff --git a/hw/char/escc.c b/hw/char/escc.c index a2fb682f8be..3b46818ecc9 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -26,7 +26,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/char/escc.h" diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index d1c2f249150..46fc4e31b83 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/char/goldfish_tty.c b/hw/char/goldfish_tty.c index 35bcb2a9676..8e1e9228c78 100644 --- a/hw/char/goldfish_tty.c +++ b/hw/char/goldfish_tty.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "chardev/char-fe.h" #include "qemu/log.h" diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index 7be847d0932..92f534552ee 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -29,7 +29,7 @@ #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" #include "hw/char/grlib_uart.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/module.h" #include "chardev/char-fe.h" =20 diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 51edf917c94..24fd42da063 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -8,7 +8,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/module.h" #include "qapi/error.h" #include "hw/m68k/mcf.h" diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 0b0af677988..ac453c1057f 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -22,7 +22,7 @@ #include "qapi/error.h" #include "hw/char/pl011.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index b3bed2bb7bf..10f96e3a44b 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -26,7 +26,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev.h" #include "hw/core/qdev-properties.h" diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index ba7e9e339b6..3ef99adadda 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -29,7 +29,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/module.h" #include "chardev/char-fe.h" #include "qom/object.h" diff --git a/hw/core/qdev.c b/hw/core/qdev.c index a3b41286ea0..fc3425a8fe1 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -35,7 +35,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/boards.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-clock.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index ae447c1196a..3adf2f2faf2 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "monitor/monitor.h" #include "system/address-spaces.h" =20 diff --git a/hw/display/artist.c b/hw/display/artist.c index 22524d9c5fe..206f77afba1 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -14,7 +14,7 @@ #include "qemu/units.h" #include "qemu/bswap.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/loader.h" #include "hw/core/qdev.h" #include "hw/core/qdev-properties.h" diff --git a/hw/display/cg3.c b/hw/display/cg3.c index f4067d7825a..59d66d3d4b8 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -28,7 +28,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "ui/console.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/core/loader.h" diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 8e3a61ed0e8..7f841b88047 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -26,7 +26,7 @@ #include "hw/core/qdev-properties.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "ui/console.h" #include "ui/pixel_ops.h" diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 8ed3e6ecc37..2eefafcaf67 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -28,7 +28,7 @@ #include "ui/console.h" #include "ui/pixel_ops.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qom/object.h" =20 diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c index 90e82b58be2..9d62e51bed9 100644 --- a/hw/display/jazz_led.c +++ b/hw/display/jazz_led.c @@ -27,7 +27,7 @@ #include "ui/console.h" #include "ui/pixel_ops.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qom/object.h" =20 diff --git a/hw/display/macfb.c b/hw/display/macfb.c index fa3572ead34..388f8de5070 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "ui/console.h" #include "ui/pixel_ops.h" #include "hw/nubus/nubus.h" diff --git a/hw/display/pl110.c b/hw/display/pl110.c index 2537c264625..4cd62a98757 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "ui/console.h" diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 6ccec03fe72..a07aa9886f9 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -32,7 +32,7 @@ #include "hw/usb/hcd-ohci.h" #include "hw/char/serial-mm.h" #include "ui/console.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/pci_device.h" #include "hw/core/qdev-properties.h" diff --git a/hw/display/tcx.c b/hw/display/tcx.c index b208923523a..7cba3e25a78 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -29,7 +29,7 @@ #include "ui/pixel_ops.h" #include "hw/core/loader.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c index 4c497b70f41..1a9608d865f 100644 --- a/hw/display/vga-mmio.c +++ b/hw/display/vga-mmio.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/display/vga.h" #include "hw/core/qdev-properties.h" #include "ui/console.h" diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index bd61d8ed488..514206b7c31 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index 4f00092f856..5a8df39d8f5 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -18,7 +18,7 @@ #include "qemu/cutils.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index 8ce74257b62..93db286e690 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -26,7 +26,7 @@ #include "qemu/units.h" #include "hw/core/irq.h" #include "hw/mips/mips.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/dma/sifive_pdma.c b/hw/dma/sifive_pdma.c index 2fbc37ffd14..2844515b2d7 100644 --- a/hw/dma/sifive_pdma.c +++ b/hw/dma/sifive_pdma.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "system/dma.h" #include "hw/dma/sifive_pdma.h" diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 5601d221ec2..5b770599865 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -30,7 +30,7 @@ #include "hw/core/qdev-properties.h" #include "hw/sparc/sparc32_dma.h" #include "hw/sparc/sun4m_iommu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "system/dma.h" #include "qapi/error.h" diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 90ba7bf0573..8488f125b5f 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/timer.h" #include "hw/hw.h" diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c index b390d092699..436f9915e02 100644 --- a/hw/dma/xlnx_csu_dma.c +++ b/hw/dma/xlnx_csu_dma.c @@ -23,7 +23,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "system/dma.h" #include "hw/core/ptimer.h" diff --git a/hw/gpio/bcm2835_gpio.c b/hw/gpio/bcm2835_gpio.c index bd9170b8932..d7c44ea2abe 100644 --- a/hw/gpio/bcm2835_gpio.c +++ b/hw/gpio/bcm2835_gpio.c @@ -16,7 +16,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/sd/sd.h" #include "hw/gpio/bcm2835_gpio.h" diff --git a/hw/gpio/bcm2838_gpio.c b/hw/gpio/bcm2838_gpio.c index dab50faf285..4ae7706b9a0 100644 --- a/hw/gpio/bcm2838_gpio.c +++ b/hw/gpio/bcm2838_gpio.c @@ -15,7 +15,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/sd/sd.h" #include "hw/gpio/bcm2838_gpio.h" diff --git a/hw/gpio/gpio_key.c b/hw/gpio/gpio_key.c index f8cf4da239a..14e0fb9d4cb 100644 --- a/hw/gpio/gpio_key.c +++ b/hw/gpio/gpio_key.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/gpio/gpio_pwr.c b/hw/gpio/gpio_pwr.c index 2d14f8b344c..a60b24a5535 100644 --- a/hw/gpio/gpio_pwr.c +++ b/hw/gpio/gpio_pwr.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/runstate.h" =20 #define TYPE_GPIOPWR "gpio-pwr" diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c index 377832e9d24..2e882329f0f 100644 --- a/hw/gpio/mpc8xxx.c +++ b/hw/gpio/mpc8xxx.c @@ -21,7 +21,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qom/object.h" =20 diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 0c2a0f9aa6c..f7619260ca7 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -23,7 +23,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/arm/omap.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c index 55f51b6cf20..d6a4fb90b96 100644 --- a/hw/gpio/pl061.c +++ b/hw/gpio/pl061.c @@ -31,7 +31,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c index 0a9f76e7743..3cf626a550d 100644 --- a/hw/gpio/zaurus.c +++ b/hw/gpio/zaurus.c @@ -18,7 +18,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/log.h" diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 86b53a23ade..c01f3392360 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -18,7 +18,7 @@ #include "hw/hyperv/hyperv.h" #include "hw/hyperv/vmbus.h" #include "hw/hyperv/vmbus-bridge.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "exec/target_page.h" #include "trace.h" =20 diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c index 1f9ce131bf7..faf2160c067 100644 --- a/hw/i2c/aspeed_i2c.c +++ b/hw/i2c/aspeed_i2c.c @@ -19,7 +19,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/cutils.h" #include "qemu/log.h" diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c index d379cfd7751..1f5d66ce33d 100644 --- a/hw/i2c/bitbang_i2c.c +++ b/hw/i2c/bitbang_i2c.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/i2c/bitbang_i2c.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/module.h" #include "qom/object.h" #include "trace.h" diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c index dd72dda4fd0..9fac588e82e 100644 --- a/hw/i2c/exynos4210_i2c.c +++ b/hw/i2c/exynos4210_i2c.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qemu/timer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/i2c/i2c.h" #include "hw/core/irq.h" diff --git a/hw/i2c/i2c_mux_pca954x.c b/hw/i2c/i2c_mux_pca954x.c index 7802c68452f..c6034460284 100644 --- a/hw/i2c/i2c_mux_pca954x.c +++ b/hw/i2c/i2c_mux_pca954x.c @@ -21,7 +21,7 @@ #include "hw/i2c/smbus_slave.h" #include "hw/core/qdev.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/queue.h" diff --git a/hw/i2c/mpc_i2c.c b/hw/i2c/mpc_i2c.c index e2097f819ce..abb2240f9f3 100644 --- a/hw/i2c/mpc_i2c.c +++ b/hw/i2c/mpc_i2c.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qom/object.h" #include "trace.h" diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index c768f99e384..e0798f2c8a5 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -24,7 +24,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/arm/omap.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/error-report.h" #include "qapi/error.h" =20 diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index f744be9f70f..224b7b94790 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -23,7 +23,7 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "intel_iommu_internal.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index 310b9a8eb5a..8ca88afae24 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -21,7 +21,7 @@ #include "system/hw_accel.h" #include "kvm/kvm_i386.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i386/kvm/clock.h" #include "hw/core/qdev-properties.h" #include "qapi/error.h" diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c index a510ab871de..b65871f3542 100644 --- a/hw/i386/kvm/xen_evtchn.c +++ b/hw/i386/kvm/xen_evtchn.c @@ -27,7 +27,7 @@ #include "migration/vmstate.h" #include "trace.h" =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" diff --git a/hw/i386/kvm/xen_gnttab.c b/hw/i386/kvm/xen_gnttab.c index 4b9e272c5eb..85b324e62d0 100644 --- a/hw/i386/kvm/xen_gnttab.c +++ b/hw/i386/kvm/xen_gnttab.c @@ -20,7 +20,7 @@ #include "system/address-spaces.h" #include "migration/vmstate.h" =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen_backend_ops.h" #include "xen_overlay.h" diff --git a/hw/i386/kvm/xen_overlay.c b/hw/i386/kvm/xen_overlay.c index 3cb73619371..74cadffb728 100644 --- a/hw/i386/kvm/xen_overlay.c +++ b/hw/i386/kvm/xen_overlay.c @@ -19,7 +19,7 @@ #include "system/address-spaces.h" #include "migration/vmstate.h" =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen.h" #include "xen_overlay.h" =20 diff --git a/hw/i386/kvm/xen_primary_console.c b/hw/i386/kvm/xen_primary_co= nsole.c index 6e9d6417c3e..bf61f6235be 100644 --- a/hw/i386/kvm/xen_primary_console.c +++ b/hw/i386/kvm/xen_primary_console.c @@ -13,7 +13,7 @@ =20 #include "qapi/error.h" =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen_backend_ops.h" #include "xen_evtchn.h" diff --git a/hw/i386/kvm/xen_xenstore.c b/hw/i386/kvm/xen_xenstore.c index 42955cccd90..0dc0edf3bfd 100644 --- a/hw/i386/kvm/xen_xenstore.c +++ b/hw/i386/kvm/xen_xenstore.c @@ -20,7 +20,7 @@ #include "qom/object.h" #include "migration/vmstate.h" =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen_backend_ops.h" #include "xen_overlay.h" diff --git a/hw/i386/microvm-dt.c b/hw/i386/microvm-dt.c index 81eaddafc8b..45fbb5bbd15 100644 --- a/hw/i386/microvm-dt.c +++ b/hw/i386/microvm-dt.c @@ -37,7 +37,7 @@ #include "hw/char/serial-isa.h" #include "hw/i386/fw_cfg.h" #include "hw/rtc/mc146818rtc.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/virtio/virtio-mmio.h" #include "hw/usb/xhci.h" =20 diff --git a/hw/i386/nitro_enclave.c b/hw/i386/nitro_enclave.c index 5ee50f3b858..640b1d8c548 100644 --- a/hw/i386/nitro_enclave.c +++ b/hw/i386/nitro_enclave.c @@ -14,7 +14,7 @@ #include "qom/object_interfaces.h" =20 #include "chardev/char.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/eif.h" #include "hw/i386/x86.h" #include "hw/i386/microvm.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3f8fd078318..2e2671d6050 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -41,7 +41,7 @@ #include "hw/core/irq.h" #include "system/kvm.h" #include "hw/i386/kvm/clock.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i2c/smbus_eeprom.h" #include "system/memory.h" #include "hw/acpi/acpi.h" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 906df5e7886..d8a86756ca4 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -29,7 +29,7 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" #include "hw/core/loader.h" diff --git a/hw/i386/vapic.c b/hw/i386/vapic.c index 3a4254638b2..32f92a28b88 100644 --- a/hw/i386/vapic.c +++ b/hw/i386/vapic.c @@ -19,7 +19,7 @@ #include "system/runstate.h" #include "system/address-spaces.h" #include "hw/i386/apic_internal.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/boards.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index 21e0d40e114..33ac0bfc97e 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i386/x86-iommu.h" #include "hw/core/qdev-properties.h" #include "hw/i386/pc.h" diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index 04b56ac5d86..0de904ac56a 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -24,7 +24,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "system/dma.h" diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index e34e9cb5c02..c03a127f3df 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/input/ps2.h" #include "hw/input/lasips2.h" #include "exec/hwaddr.h" diff --git a/hw/input/pl050.c b/hw/input/pl050.c index cb8efc74f77..48df2734e26 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -16,7 +16,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/input/ps2.h" #include "hw/input/pl050.h" diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 96850124a7b..10ac7324030 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/input/ps2.h" #include "migration/vmstate.h" #include "ui/console.h" diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c index 0e1ec521e42..8e17a77c801 100644 --- a/hw/intc/allwinner-a10-pic.c +++ b/hw/intc/allwinner-a10-pic.c @@ -16,7 +16,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/intc/allwinner-a10-pic.h" #include "hw/core/irq.h" diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index afac20440f8..4e9e3089945 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -30,7 +30,7 @@ #include "hw/core/boards.h" #include "system/kvm.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" =20 bool apic_report_tpr_access; diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index e27bb20bf8c..4d0cb125a61 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "gic_internal.h" #include "qapi/error.h" #include "hw/core/cpu.h" diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c index c39d31b1870..b343e17ca53 100644 --- a/hw/intc/arm_gicv2m.c +++ b/hw/intc/arm_gicv2m.c @@ -27,7 +27,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/pci/msi.h" #include "hw/core/qdev-properties.h" diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 5fa210c6335..3a31eb56f36 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "hw/intc/armv7m_nvic.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index 8bea69d91b7..ec935a084db 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -28,7 +28,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/intc/exynos4210_combiner.h" diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index a65c9c6d28b..d15e41174a9 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -21,7 +21,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/intc/goldfish_pic.c b/hw/intc/goldfish_pic.c index 96e7d5c225f..16f351a30d3 100644 --- a/hw/intc/goldfish_pic.c +++ b/hw/intc/goldfish_pic.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c index ce7cbc98c17..d860ec15d88 100644 --- a/hw/intc/grlib_irqmp.c +++ b/hw/intc/grlib_irqmp.c @@ -28,7 +28,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #include "hw/core/qdev-properties.h" #include "hw/intc/grlib_irqmp.h" diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index fce3486e519..d3bcd5699f5 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -26,7 +26,7 @@ #include "hw/intc/intc.h" #include "hw/intc/ioapic.h" #include "hw/intc/ioapic_internal.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* ioapic_no count start from 0 to MAX_IOAPICS, * remove as static variable from ioapic_common_init. diff --git a/hw/intc/loongarch_dintc.c b/hw/intc/loongarch_dintc.c index 574e4a0d277..c42a919df4a 100644 --- a/hw/intc/loongarch_dintc.c +++ b/hw/intc/loongarch_dintc.c @@ -6,7 +6,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/intc/loongarch_pch_msi.h" #include "hw/intc/loongarch_pch_pic.h" diff --git a/hw/intc/loongarch_pch_msi.c b/hw/intc/loongarch_pch_msi.c index 63090b27261..3656c6cea97 100644 --- a/hw/intc/loongarch_pch_msi.c +++ b/hw/intc/loongarch_pch_msi.c @@ -6,7 +6,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/intc/loongarch_pch_msi.h" #include "hw/intc/loongarch_pch_pic.h" diff --git a/hw/intc/loongson_ipi_common.c b/hw/intc/loongson_ipi_common.c index b3d8e781ca1..d9d8a374d36 100644 --- a/hw/intc/loongson_ipi_common.c +++ b/hw/intc/loongson_ipi_common.c @@ -6,7 +6,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/loongson_ipi_common.h" #include "hw/core/irq.h" #include "qemu/log.h" diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index e983f3a2b58..ad9363a4c7d 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -13,7 +13,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/memory.h" #include "system/kvm.h" #include "system/reset.h" diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index deb21f9dc19..b2438d2d5f8 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -22,7 +22,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/arm/omap.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c index 05f0ef82549..58736cd8a0c 100644 --- a/hw/intc/ompic.c +++ b/hw/intc/ompic.c @@ -11,7 +11,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "system/memory.h" #include "qom/object.h" diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index 4cc5068ffc8..cd353a04f53 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -36,7 +36,7 @@ #include "hw/ppc/openpic.h" #include "hw/ppc/ppc_e500.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/msi.h" #include "qapi/error.h" diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 6558135baa1..9aafef5d9eb 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -29,7 +29,7 @@ #include "hw/ppc/openpic_kvm.h" #include "hw/pci/msi.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/kvm.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c index f1e4959e9ae..d53292d15e8 100644 --- a/hw/intc/pl190.c +++ b/hw/intc/pl190.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c index 83968ad7cca..9c1491bd043 100644 --- a/hw/intc/riscv_aclint.c +++ b/hw/intc/riscv_aclint.c @@ -26,7 +26,7 @@ #include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/riscv/cpu.h" #include "target/riscv/time_helper.h" #include "hw/core/qdev-properties.h" diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c index cc5f30b5588..92ff0ecaa74 100644 --- a/hw/intc/riscv_aplic.c +++ b/hw/intc/riscv_aplic.c @@ -23,7 +23,7 @@ #include "qemu/error-report.h" #include "qemu/bswap.h" #include "system/address-spaces.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/msi.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c index bc580c000ef..7c9a0120335 100644 --- a/hw/intc/riscv_imsic.c +++ b/hw/intc/riscv_imsic.c @@ -23,7 +23,7 @@ #include "qemu/error-report.h" #include "qemu/bswap.h" #include "system/address-spaces.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/msi.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index 508b58382ed..57fd4b2b81c 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -14,7 +14,7 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/s390x/ioinst.h" #include "hw/s390x/s390_flic.h" #include "hw/core/qdev-properties.h" diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c index 5df578822f9..9c84ff06a9f 100644 --- a/hw/intc/sifive_plic.c +++ b/hw/intc/sifive_plic.c @@ -23,7 +23,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qemu/error-report.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/msi.h" #include "hw/core/qdev-properties.h" #include "hw/intc/sifive_plic.h" diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c index b12c8cbd69f..640d8e2baa6 100644 --- a/hw/intc/slavio_intctl.c +++ b/hw/intc/slavio_intctl.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "migration/vmstate.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/intc.h" #include "hw/core/irq.h" #include "trace.h" diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index f93f0d6e7ea..782a286e43c 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -27,7 +27,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/module.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c index b8bafe2f3f3..0d9e85473d3 100644 --- a/hw/intc/xlnx-pmu-iomod-intc.c +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -25,7 +25,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/register.h" #include "qemu/bitops.h" diff --git a/hw/intc/xlnx-zynqmp-ipi.c b/hw/intc/xlnx-zynqmp-ipi.c index e69ea74ff74..3538a0e5db9 100644 --- a/hw/intc/xlnx-zynqmp-ipi.c +++ b/hw/intc/xlnx-zynqmp-ipi.c @@ -26,7 +26,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/register.h" #include "qemu/bitops.h" diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 6c9802eb7ac..7e6d2ce5a94 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -21,7 +21,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/system.h" #include "hw/isa/isa.h" =20 diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index 4bc7b1d189e..c5befa02eb5 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -17,7 +17,7 @@ #include "qemu/timer.h" #include "hw/core/ptimer.h" #include "system/system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 /* General purpose timer module. */ typedef struct { diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 3a87e1f282c..c6d1c5fae9f 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -31,7 +31,7 @@ #include "net/net.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "elf.h" =20 #define SYS_FREQ 166666666 diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c index b8770e3a53f..20112c94be1 100644 --- a/hw/m68k/mcf_intc.c +++ b/hw/m68k/mcf_intc.c @@ -12,7 +12,7 @@ #include "qemu/log.h" #include "cpu.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/m68k/mcf.h" #include "hw/core/qdev-properties.h" #include "qom/object.h" diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 75ae66c311a..ca3df7b887b 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -20,7 +20,7 @@ #include "hw/core/boards.h" #include "hw/core/loader.h" #include "hw/scsi/esp.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "hw/char/escc.h" /* ZILOG 8530 Serial Emulation */ #include "hw/block/fdc.h" diff --git a/hw/m68k/next-kbd.c b/hw/m68k/next-kbd.c index 2bec945acfb..571a9555040 100644 --- a/hw/m68k/next-kbd.c +++ b/hw/m68k/next-kbd.c @@ -29,7 +29,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/m68k/next-cube.h" #include "ui/console.h" #include "migration/vmstate.h" diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 6fe030e8c5d..25ddddb5d9f 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -33,7 +33,7 @@ #include "hw/core/loader.h" #include "ui/console.h" #include "hw/char/escc.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/scsi/esp.h" #include "standard-headers/asm-m68k/bootinfo.h" #include "standard-headers/asm-m68k/bootinfo-mac.h" diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 2d83919fa86..7be3a248000 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -18,7 +18,7 @@ #include "elf.h" #include "hw/core/loader.h" #include "ui/console.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "standard-headers/asm-m68k/bootinfo.h" #include "standard-headers/asm-m68k/bootinfo-virt.h" #include "bootinfo.h" diff --git a/hw/mem/sparse-mem.c b/hw/mem/sparse-mem.c index 9186da6b1a9..3b754de887e 100644 --- a/hw/mem/sparse-mem.c +++ b/hw/mem/sparse-mem.c @@ -14,7 +14,7 @@ #include "qemu/error-report.h" =20 #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/units.h" #include "system/qtest.h" diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_= ml605_mmu.c index 51ee237d584..b3bdc4d65f2 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -29,7 +29,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "hw/block/flash.h" #include "system/system.h" diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petal= ogix_s3adsp1800_mmu.c index 266ecf9e8ab..2a853a7fa5f 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -27,7 +27,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "hw/block/flash.h" #include "system/system.h" diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index fb01af8ece3..e0adb96c548 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -43,7 +43,7 @@ #include "hw/display/bochs-vbe.h" #include "hw/audio/pcspk.h" #include "hw/input/i8042.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/qtest.h" #include "system/reset.h" #include "qapi/error.h" diff --git a/hw/mips/malta.c b/hw/mips/malta.c index e5ed0b56923..812ff64d831 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -47,7 +47,7 @@ #include "hw/core/loader.h" #include "elf.h" #include "qom/object.h" -#include "hw/sysbus.h" /* SysBusDevice */ +#include "hw/core/sysbus.h" /* SysBusDevice */ #include "qemu/host-utils.h" #include "system/qtest.h" #include "system/reset.h" diff --git a/hw/misc/allwinner-a10-ccm.c b/hw/misc/allwinner-a10-ccm.c index 6b188c25a5d..dc7f8ff205a 100644 --- a/hw/misc/allwinner-a10-ccm.c +++ b/hw/misc/allwinner-a10-ccm.c @@ -22,7 +22,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-a10-dramc.c b/hw/misc/allwinner-a10-dramc.c index c16814cc5b8..757f2cad957 100644 --- a/hw/misc/allwinner-a10-dramc.c +++ b/hw/misc/allwinner-a10-dramc.c @@ -22,7 +22,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-cpucfg.c b/hw/misc/allwinner-cpucfg.c index 90dd872abf0..3a1526bda0d 100644 --- a/hw/misc/allwinner-cpucfg.c +++ b/hw/misc/allwinner-cpucfg.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-h3-ccu.c b/hw/misc/allwinner-h3-ccu.c index be91c0c1cae..ac5ae01acc0 100644 --- a/hw/misc/allwinner-h3-ccu.c +++ b/hw/misc/allwinner-h3-ccu.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-h3-dramc.c b/hw/misc/allwinner-h3-dramc.c index ef491b36ffb..10d929a3039 100644 --- a/hw/misc/allwinner-h3-dramc.c +++ b/hw/misc/allwinner-h3-dramc.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/error-report.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-h3-sysctrl.c b/hw/misc/allwinner-h3-sysctrl.c index 6b86524606a..d37c0a6e260 100644 --- a/hw/misc/allwinner-h3-sysctrl.c +++ b/hw/misc/allwinner-h3-sysctrl.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-r40-ccu.c b/hw/misc/allwinner-r40-ccu.c index 4e21eeafdd0..8ba4e7aa429 100644 --- a/hw/misc/allwinner-r40-ccu.c +++ b/hw/misc/allwinner-r40-ccu.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-r40-dramc.c b/hw/misc/allwinner-r40-dramc.c index 3af8af733ac..8e6aa7c3106 100644 --- a/hw/misc/allwinner-r40-dramc.c +++ b/hw/misc/allwinner-r40-dramc.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/error-report.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-sid.c b/hw/misc/allwinner-sid.c index 92a0c7918bc..b5f827d4bdf 100644 --- a/hw/misc/allwinner-sid.c +++ b/hw/misc/allwinner-sid.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-sramc.c b/hw/misc/allwinner-sramc.c index 423e0a844fa..1d30f8cf326 100644 --- a/hw/misc/allwinner-sramc.c +++ b/hw/misc/allwinner-sramc.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/arm_integrator_debug.c b/hw/misc/arm_integrator_debug.c index 9a197278290..9ac6a50a930 100644 --- a/hw/misc/arm_integrator_debug.c +++ b/hw/misc/arm_integrator_debug.c @@ -15,7 +15,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/arm_integrator_debug.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c index a5511845c7c..039f1b0f2ce 100644 --- a/hw/misc/arm_l2x0.c +++ b/hw/misc/arm_l2x0.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index 0c91ebafac7..2a317ac7f5b 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -13,7 +13,7 @@ #include "qemu/timer.h" #include "system/runstate.h" #include "qemu/bitops.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/primecell.h" #include "qemu/log.h" diff --git a/hw/misc/armsse-cpu-pwrctrl.c b/hw/misc/armsse-cpu-pwrctrl.c index 87770facfce..86a26a8ac5a 100644 --- a/hw/misc/armsse-cpu-pwrctrl.c +++ b/hw/misc/armsse-cpu-pwrctrl.c @@ -21,7 +21,7 @@ #include "trace.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/registerfields.h" #include "hw/misc/armsse-cpu-pwrctrl.h" =20 diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c index 03833125514..ea2a099ccb1 100644 --- a/hw/misc/armsse-cpuid.c +++ b/hw/misc/armsse-cpuid.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "trace.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/registerfields.h" #include "hw/misc/armsse-cpuid.h" #include "hw/core/qdev-properties.h" diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c index 6fbe2cca37e..48c4b59067a 100644 --- a/hw/misc/armsse-mhu.c +++ b/hw/misc/armsse-mhu.c @@ -20,7 +20,7 @@ #include "qemu/module.h" #include "trace.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/core/irq.h" diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c index f93cbd16590..dd1be7d698e 100644 --- a/hw/misc/eccmemctl.c +++ b/hw/misc/eccmemctl.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/misc/empty_slot.c b/hw/misc/empty_slot.c index a012668214f..aab9373c097 100644 --- a/hw/misc/empty_slot.c +++ b/hw/misc/empty_slot.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "hw/misc/empty_slot.h" #include "qapi/error.h" diff --git a/hw/misc/exynos4210_clk.c b/hw/misc/exynos4210_clk.c index fdf5bdd6034..e7526792191 100644 --- a/hw/misc/exynos4210_clk.c +++ b/hw/misc/exynos4210_clk.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/exynos4210_pmu.c b/hw/misc/exynos4210_pmu.c index a86ec9aba85..0be793b3aa7 100644 --- a/hw/misc/exynos4210_pmu.c +++ b/hw/misc/exynos4210_pmu.c @@ -25,7 +25,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "system/runstate.h" diff --git a/hw/misc/exynos4210_rng.c b/hw/misc/exynos4210_rng.c index 2d0ebc457bc..3f743b47502 100644 --- a/hw/misc/exynos4210_rng.c +++ b/hw/misc/exynos4210_rng.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/misc/grlib_ahb_apb_pnp.c b/hw/misc/grlib_ahb_apb_pnp.c index cdca00ad542..0d12bcde9d8 100644 --- a/hw/misc/grlib_ahb_apb_pnp.c +++ b/hw/misc/grlib_ahb_apb_pnp.c @@ -23,7 +23,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/grlib_ahb_apb_pnp.h" #include "trace.h" =20 diff --git a/hw/misc/iosb.c b/hw/misc/iosb.c index 96221e1ee5a..ea63e34b937 100644 --- a/hw/misc/iosb.c +++ b/hw/misc/iosb.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/iosb.h" #include "trace.h" =20 diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c index 832b0217774..54bfe1ba597 100644 --- a/hw/misc/iotkit-secctl.c +++ b/hw/misc/iotkit-secctl.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/core/irq.h" diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c index d673ae326bc..dff89c677f7 100644 --- a/hw/misc/iotkit-sysctl.c +++ b/hw/misc/iotkit-sysctl.c @@ -23,7 +23,7 @@ #include "system/runstate.h" #include "trace.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/misc/iotkit-sysctl.h" diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c index 3b4d228e3ef..19f089e6ee9 100644 --- a/hw/misc/iotkit-sysinfo.c +++ b/hw/misc/iotkit-sysinfo.c @@ -22,7 +22,7 @@ #include "qemu/module.h" #include "trace.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/registerfields.h" #include "hw/misc/iotkit-sysinfo.h" #include "hw/core/qdev-properties.h" diff --git a/hw/misc/ivshmem-flat.c b/hw/misc/ivshmem-flat.c index 1248f9e81bc..920aa4943a7 100644 --- a/hw/misc/ivshmem-flat.c +++ b/hw/misc/ivshmem-flat.c @@ -15,7 +15,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "system/address-spaces.h" #include "trace.h" diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index 0c608c3dc63..26ee230dcc4 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "system/address-spaces.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "qemu/timer.h" #include "hw/misc/mac_via.h" diff --git a/hw/misc/mchp_pfsoc_dmc.c b/hw/misc/mchp_pfsoc_dmc.c index 599f845f459..1fe4535464f 100644 --- a/hw/misc/mchp_pfsoc_dmc.c +++ b/hw/misc/mchp_pfsoc_dmc.c @@ -24,7 +24,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/mchp_pfsoc_dmc.h" =20 /* DDR SGMII PHY module */ diff --git a/hw/misc/mchp_pfsoc_ioscb.c b/hw/misc/mchp_pfsoc_ioscb.c index 84e957244e5..05538d012a9 100644 --- a/hw/misc/mchp_pfsoc_ioscb.c +++ b/hw/misc/mchp_pfsoc_ioscb.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/mchp_pfsoc_ioscb.h" =20 /* diff --git a/hw/misc/mchp_pfsoc_sysreg.c b/hw/misc/mchp_pfsoc_sysreg.c index 2a415151037..f190ecc78e0 100644 --- a/hw/misc/mchp_pfsoc_sysreg.c +++ b/hw/misc/mchp_pfsoc_sysreg.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/mchp_pfsoc_sysreg.h" #include "system/runstate.h" =20 diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c index 1c6e9d1f6f0..3e262e828bc 100644 --- a/hw/misc/mips_cmgcr.c +++ b/hw/misc/mips_cmgcr.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/misc/mips_cmgcr.h" #include "hw/misc/mips_cpc.h" diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c index efc0326f6f2..924de855ee2 100644 --- a/hw/misc/mips_cpc.c +++ b/hw/misc/mips_cpc.c @@ -22,7 +22,7 @@ #include "cpu.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" =20 #include "hw/misc/mips_cpc.h" diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c index 9cd5e9884c0..da78cb60701 100644 --- a/hw/misc/mps2-fpgaio.c +++ b/hw/misc/mps2-fpgaio.c @@ -20,7 +20,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/misc/mps2-fpgaio.h" diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index 06d436cf58e..350bba3dab8 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -22,7 +22,7 @@ #include "qemu/module.h" #include "qemu/bitops.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" diff --git a/hw/misc/pvpanic-mmio.c b/hw/misc/pvpanic-mmio.c index 2d1464435a8..a173a1a9a58 100644 --- a/hw/misc/pvpanic-mmio.c +++ b/hw/misc/pvpanic-mmio.c @@ -10,7 +10,7 @@ =20 #include "hw/core/qdev-properties.h" #include "hw/misc/pvpanic.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "standard-headers/misc/pvpanic.h" =20 OBJECT_DECLARE_SIMPLE_TYPE(PVPanicMMIOState, PVPANIC_MMIO_DEVICE) diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c index dfee1af5ad2..93296d3350c 100644 --- a/hw/misc/sbsa_ec.c +++ b/hw/misc/sbsa_ec.c @@ -12,7 +12,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/runstate.h" =20 typedef struct SECUREECState { diff --git a/hw/misc/sifive_e_prci.c b/hw/misc/sifive_e_prci.c index a8702c6a5d4..400664aabae 100644 --- a/hw/misc/sifive_e_prci.c +++ b/hw/misc/sifive_e_prci.c @@ -19,7 +19,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/sifive_test.c b/hw/misc/sifive_test.c index b94bb2d29db..41f102e2dca 100644 --- a/hw/misc/sifive_test.c +++ b/hw/misc/sifive_test.c @@ -19,7 +19,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/sifive_u_otp.c b/hw/misc/sifive_u_otp.c index 899bc31745c..7205374bc39 100644 --- a/hw/misc/sifive_u_otp.c +++ b/hw/misc/sifive_u_otp.c @@ -22,7 +22,7 @@ #include "qapi/error.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/sifive_u_prci.c b/hw/misc/sifive_u_prci.c index 6e75cb6d0d5..f51588623ab 100644 --- a/hw/misc/sifive_u_prci.c +++ b/hw/misc/sifive_u_prci.c @@ -19,7 +19,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/misc/sifive_u_prci.h" diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c index 43ce5d0bc97..49be827c458 100644 --- a/hw/misc/slavio_misc.c +++ b/hw/misc/slavio_misc.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "system/runstate.h" diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c index 65517d390d3..02fe0bcb1d5 100644 --- a/hw/misc/tz-mpc.c +++ b/hw/misc/tz-mpc.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/core/irq.h" diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c index dd845193d64..9d9fc072ff0 100644 --- a/hw/misc/tz-msc.c +++ b/hw/misc/tz-msc.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/core/irq.h" diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c index 7b812a034b2..159073d1e6d 100644 --- a/hw/misc/tz-ppc.c +++ b/hw/misc/tz-ppc.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/core/irq.h" diff --git a/hw/misc/unimp.c b/hw/misc/unimp.c index 4370c14ef16..521b84bf20b 100644 --- a/hw/misc/unimp.c +++ b/hw/misc/unimp.c @@ -12,7 +12,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/unimp.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/virt_ctrl.c b/hw/misc/virt_ctrl.c index 7cb1ea5d181..40747925a29 100644 --- a/hw/misc/virt_ctrl.c +++ b/hw/misc/virt_ctrl.c @@ -6,7 +6,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-= reg.c index efacbe83abb..47d3b9e84ad 100644 --- a/hw/misc/xlnx-versal-cframe-reg.c +++ b/hw/misc/xlnx-versal-cframe-reg.c @@ -9,7 +9,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/core/registerfields.h" #include "qemu/bitops.h" diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c index bdce0ce7475..86df37d6e8a 100644 --- a/hw/misc/xlnx-versal-cfu.c +++ b/hw/misc/xlnx-versal-cfu.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/core/irq.h" #include "qemu/bitops.h" diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c index 9bbf44def6b..1379974f81e 100644 --- a/hw/misc/xlnx-versal-crl.c +++ b/hw/misc/xlnx-versal-crl.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/register.h" #include "hw/core/resettable.h" diff --git a/hw/misc/xlnx-versal-pmc-iou-slcr.c b/hw/misc/xlnx-versal-pmc-i= ou-slcr.c index 0246167a5e6..57a24641cfa 100644 --- a/hw/misc/xlnx-versal-pmc-iou-slcr.c +++ b/hw/misc/xlnx-versal-pmc-iou-slcr.c @@ -24,7 +24,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/core/irq.h" #include "qemu/bitops.h" diff --git a/hw/misc/xlnx-versal-xramc.c b/hw/misc/xlnx-versal-xramc.c index f4f02c7680b..da8c98ae032 100644 --- a/hw/misc/xlnx-versal-xramc.c +++ b/hw/misc/xlnx-versal-xramc.c @@ -10,7 +10,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/core/qdev-properties.h" #include "hw/core/irq.h" diff --git a/hw/misc/xlnx-zynqmp-apu-ctrl.c b/hw/misc/xlnx-zynqmp-apu-ctrl.c index 957043f01b9..c46951d552e 100644 --- a/hw/misc/xlnx-zynqmp-apu-ctrl.c +++ b/hw/misc/xlnx-zynqmp-apu-ctrl.c @@ -13,7 +13,7 @@ #include "qemu/log.h" #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/register.h" =20 diff --git a/hw/misc/xlnx-zynqmp-crf.c b/hw/misc/xlnx-zynqmp-crf.c index a2ebf6ce5d7..1f7107c322c 100644 --- a/hw/misc/xlnx-zynqmp-crf.c +++ b/hw/misc/xlnx-zynqmp-crf.c @@ -7,7 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index d7d490b093d..faae98fa023 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "qemu/timer.h" #include "system/runstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c index 8ff0db5ccdc..9b7c67ae8e4 100644 --- a/hw/net/allwinner-sun8i-emac.c +++ b/hw/net/allwinner-sun8i-emac.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" #include "hw/core/irq.h" diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c index cbe4cb80e4a..55d1b6a9a6b 100644 --- a/hw/net/allwinner_emac.c +++ b/hw/net/allwinner_emac.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" #include "qemu/fifo8.h" diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 3ceb1a8b912..4a7cdc31ee4 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -31,7 +31,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/register.h" #include "qapi/error.h" diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c index 6c583cab8f5..bccf6240169 100644 --- a/hw/net/can/xlnx-zynqmp-can.c +++ b/hw/net/can/xlnx-zynqmp-can.c @@ -30,7 +30,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/core/irq.h" #include "qapi/error.h" diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 182f0e5f6b1..5b611fcbbe7 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -21,7 +21,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/net/dp8393x.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" #include "qapi/error.h" diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 5b77528e365..1d61d918b8d 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -27,7 +27,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/net/mii.h" #include "hw/core/ptimer.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index 381fd387641..072a741d811 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -11,7 +11,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" diff --git a/hw/net/lasi_i82596.c b/hw/net/lasi_i82596.c index 50e3c4fa86d..423a8676a08 100644 --- a/hw/net/lasi_i82596.c +++ b/hw/net/lasi_i82596.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/timer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/system.h" #include "net/eth.h" #include "hw/net/lasi_82596.h" diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index ecf105adf2e..5f267e5ea38 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -15,7 +15,7 @@ #include "hw/m68k/mcf_fec.h" #include "hw/net/mii.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include /* for crc32 */ =20 //#define DEBUG_FEC 1 diff --git a/hw/net/mv88w8618_eth.c b/hw/net/mv88w8618_eth.c index 1a1bba8b572..1fcfbe912ee 100644 --- a/hw/net/mv88w8618_eth.c +++ b/hw/net/mv88w8618_eth.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/net/mv88w8618_eth.h" #include "migration/vmstate.h" diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index 34992f3cc9f..ec3301414cc 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -35,7 +35,7 @@ #include "hw/core/irq.h" #include "hw/net/mii.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "qemu/module.h" #include "net/eth.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index d6f57bc004a..3420d8e28e1 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" #include "hw/core/irq.h" diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index c97d6945852..ac7924bdd9e 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" #include "qemu/log.h" diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index f07be725120..8d316e94c17 100644 --- a/hw/net/xgmac.c +++ b/hw/net/xgmac.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "net/net.h" diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 451f8da2122..29c09b88ebf 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 72b14811a9d..ba3acd4c77c 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -31,7 +31,7 @@ #include "qemu/bitops.h" #include "qom/object.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" diff --git a/hw/nubus/mac-nubus-bridge.c b/hw/nubus/mac-nubus-bridge.c index 0dac8d19b37..dc9ae6d21fa 100644 --- a/hw/nubus/mac-nubus-bridge.c +++ b/hw/nubus/mac-nubus-bridge.c @@ -9,7 +9,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/nubus/mac-nubus-bridge.h" =20 =20 diff --git a/hw/nubus/nubus-bridge.c b/hw/nubus/nubus-bridge.c index fb14402c4fc..f0e1620ee09 100644 --- a/hw/nubus/nubus-bridge.c +++ b/hw/nubus/nubus-bridge.c @@ -9,7 +9,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/nubus/nubus.h" =20 =20 diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c index 512e5485187..4f35bfebdab 100644 --- a/hw/nvram/ds1225y.c +++ b/hw/nvram/ds1225y.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "trace.h" #include "qemu/error-report.h" diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index e5c35b0e2e4..437ab6e210f 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -31,7 +31,7 @@ #include "hw/core/boards.h" #include "hw/nvram/fw_cfg.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index bafb877cc38..603d8ca0d99 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -31,7 +31,7 @@ #include "system/address-spaces.h" #include "system/device_tree.h" #include "system/system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/qtest.h" #include "system/reset.h" #include "hw/core/split-irq.h" diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c index 446a81579c1..54ce96666e5 100644 --- a/hw/openrisc/virt.c +++ b/hw/openrisc/virt.c @@ -22,7 +22,7 @@ #include "hw/pci-host/gpex.h" #include "hw/core/qdev-properties.h" #include "hw/rtc/goldfish_rtc.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/virtio/virtio-mmio.h" #include "system/device_tree.h" #include "system/system.h" diff --git a/hw/pci-bridge/cxl_root_port.c b/hw/pci-bridge/cxl_root_port.c index 616d5d934cc..197d3148d20 100644 --- a/hw/pci-bridge/cxl_root_port.c +++ b/hw/pci-bridge/cxl_root_port.c @@ -25,7 +25,7 @@ #include "hw/pci/msi.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "hw/cxl/cxl.h" =20 diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index 15354abf3ba..e7d638b296c 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -30,7 +30,7 @@ #include "hw/pci/pci_host.h" #include "hw/pci-host/i440fx.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "migration/vmstate.h" #include "qapi/visitor.h" diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c index 636228c4074..ef1c77563e8 100644 --- a/hw/pci-host/mv64361.c +++ b/hw/pci-host/mv64361.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" #include "hw/core/irq.h" diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c index 87af933dc29..b3f57dca7d7 100644 --- a/hw/pci-host/sabre.c +++ b/hw/pci-host/sabre.c @@ -25,7 +25,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/core/qdev-properties.h" diff --git a/hw/pci-host/sh_pci.c b/hw/pci-host/sh_pci.c index 87a71c889e4..3ffd2cdbd70 100644 --- a/hw/pci-host/sh_pci.c +++ b/hw/pci-host/sh_pci.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sh4/sh.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 1fdae78210a..b27531f7fbb 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 7f164331c8e..113a2daca1d 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -41,7 +41,7 @@ #include "hw/core/qdev-properties.h" #include "hw/core/loader.h" #include "elf.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/host-utils.h" #include "qemu/option.h" #include "hw/pci-host/ppce500.h" diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 4f1d659e723..ca5647284d0 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -15,7 +15,7 @@ #include "hw/net/fsl_etsec/etsec.h" #include "system/device_tree.h" #include "system/kvm.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci.h" #include "hw/ppc/openpic.h" #include "kvm_ppc.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 410a3ac392e..7275563a155 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -73,7 +73,7 @@ #include "system/reset.h" #include "kvm_ppc.h" #include "hw/usb/usb.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "trace.h" =20 #define MAX_IDE_BUS 2 diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c index a25041e8367..88ae573d1e8 100644 --- a/hw/ppc/mpc8544_guts.c +++ b/hw/ppc/mpc8544_guts.c @@ -21,7 +21,7 @@ #include "qemu/log.h" #include "system/runstate.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" =20 #define MPC8544_GUTS_MMIO_SIZE 0x1000 diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c index bf290a7dcd5..3e4d19fbe84 100644 --- a/hw/ppc/pegasos.c +++ b/hw/ppc/pegasos.c @@ -11,7 +11,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "hw/ppc/ppc.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_host.h" #include "hw/core/irq.h" #include "hw/core/or-irq.h" diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c index fbfec829d5b..8557b560aeb 100644 --- a/hw/ppc/pnv_xscom.c +++ b/hw/ppc/pnv_xscom.c @@ -22,7 +22,7 @@ #include "qemu/module.h" #include "system/hw_accel.h" #include "target/ppc/cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #include "hw/ppc/fdt.h" #include "hw/ppc/pnv.h" diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 491560575c0..2dde008b0e4 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -28,7 +28,7 @@ #include "hw/pci-host/ppc4xx.h" #include "system/system.h" #include "system/reset.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/ppc-uic.h" #include "hw/core/qdev-properties.h" #include "qapi/error.h" diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c index bc70e50e926..a066ada77ed 100644 --- a/hw/ppc/ppce500_spin.c +++ b/hw/ppc/ppce500_spin.c @@ -31,7 +31,7 @@ #include "qemu/module.h" #include "qemu/units.h" #include "hw/hw.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/hw_accel.h" #include "hw/ppc/ppc.h" #include "e500.h" diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index b6e233747ed..b13dd224ba1 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -30,7 +30,7 @@ #include "hw/block/flash.h" #include "system/system.h" #include "system/reset.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/char/serial-mm.h" #include "hw/i2c/ppc4xx_i2c.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index a7c064be330..ea998bdff15 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 875c17f4784..501e82a7665 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -26,7 +26,7 @@ #include "qemu/log.h" #include "hw/core/loader.h" #include "elf.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/kvm.h" #include "system/device_tree.h" #include "kvm_ppc.h" diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index cf2d10ecb27..8b3e67b627c 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -27,7 +27,7 @@ #include "qemu/units.h" #include "exec/page-protection.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/char/serial-mm.h" #include "hw/block/flash.h" #include "system/system.h" diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generi= c.c index 8a461a0dd56..d56b64792d7 100644 --- a/hw/riscv/microblaze-v-generic.c +++ b/hw/riscv/microblaze-v-generic.c @@ -17,7 +17,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/system.h" #include "net/net.h" #include "hw/core/boards.h" diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index 9de6456c141..0cf849ffb6d 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -42,7 +42,7 @@ #include "qapi/visitor.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char.h" #include "hw/cpu/cluster.h" #include "target/riscv/cpu.h" diff --git a/hw/riscv/riscv-iommu-sys.c b/hw/riscv/riscv-iommu-sys.c index 2a11c4dab6d..bf87b0b4ea3 100644 --- a/hw/riscv/riscv-iommu-sys.c +++ b/hw/riscv/riscv-iommu-sys.c @@ -20,7 +20,7 @@ #include "hw/core/irq.h" #include "hw/pci/pci_bus.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/host-utils.h" diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c index 31187487946..e675358e1a1 100644 --- a/hw/riscv/riscv_hart.c +++ b/hw/riscv/riscv_hart.c @@ -24,7 +24,7 @@ #include "system/reset.h" #include "system/qtest.h" #include "qemu/cutils.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/riscv/cpu.h" #include "hw/core/qdev-properties.h" #include "hw/riscv/riscv_hart.h" diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index c2032176c43..4cb9c07ffbf 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -34,7 +34,7 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/unimp.h" #include "target/riscv/cpu.h" #include "hw/riscv/riscv_hart.h" diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 3e081ddf37e..f1b47ab5848 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -42,7 +42,7 @@ #include "hw/core/boards.h" #include "hw/core/irq.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/cpu/cluster.h" #include "hw/misc/unimp.h" #include "hw/sd/sd.h" diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index c9451d7e3b3..ea527c7bfc1 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/riscv/cpu.h" #include "hw/riscv/riscv_hart.h" #include "hw/riscv/spike.h" diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d79add55768..c87c169d38c 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -25,7 +25,7 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "hw/char/serial-mm.h" #include "target/riscv/cpu.h" diff --git a/hw/rtc/allwinner-rtc.c b/hw/rtc/allwinner-rtc.c index 0ffd38cf787..52006a0e3a3 100644 --- a/hw/rtc/allwinner-rtc.c +++ b/hw/rtc/allwinner-rtc.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/rtc/exynos4210_rtc.c b/hw/rtc/exynos4210_rtc.c index a15b5274bd3..846839d2d8b 100644 --- a/hw/rtc/exynos4210_rtc.c +++ b/hw/rtc/exynos4210_rtc.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/bcd.h" diff --git a/hw/rtc/goldfish_rtc.c b/hw/rtc/goldfish_rtc.c index 79d2a04c721..5354a6b02f3 100644 --- a/hw/rtc/goldfish_rtc.c +++ b/hw/rtc/goldfish_rtc.c @@ -24,7 +24,7 @@ #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/bitops.h" #include "qemu/timer.h" #include "system/system.h" diff --git a/hw/rtc/ls7a_rtc.c b/hw/rtc/ls7a_rtc.c index b0c6588e098..158c8155055 100644 --- a/hw/rtc/ls7a_rtc.c +++ b/hw/rtc/ls7a_rtc.c @@ -6,7 +6,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/register.h" #include "qemu/timer.h" diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c index be8efb8c0ad..be4196b21c4 100644 --- a/hw/rtc/m48t59.c +++ b/hw/rtc/m48t59.c @@ -31,7 +31,7 @@ #include "system/runstate.h" #include "system/rtc.h" #include "system/system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/bcd.h" #include "qemu/module.h" diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c index 847349b407a..b56877c3a20 100644 --- a/hw/rtc/pl031.c +++ b/hw/rtc/pl031.c @@ -16,7 +16,7 @@ #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "system/system.h" #include "system/rtc.h" diff --git a/hw/rtc/sun4v-rtc.c b/hw/rtc/sun4v-rtc.c index 29e24ef6bed..675b6cd5bd6 100644 --- a/hw/rtc/sun4v-rtc.c +++ b/hw/rtc/sun4v-rtc.c @@ -10,7 +10,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/rtc/xlnx-zynqmp-rtc.c b/hw/rtc/xlnx-zynqmp-rtc.c index 49d48dc6782..28ae7a24f9d 100644 --- a/hw/rtc/xlnx-zynqmp-rtc.c +++ b/hw/rtc/xlnx-zynqmp-rtc.c @@ -25,7 +25,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c index e1fa3d56618..3d137a517b8 100644 --- a/hw/rx/rx62n.c +++ b/hw/rx/rx62n.c @@ -26,7 +26,7 @@ #include "qemu/units.h" #include "hw/rx/rx62n.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "system/system.h" #include "qobject/qlist.h" diff --git a/hw/s390x/ap-bridge.c b/hw/s390x/ap-bridge.c index edeb3dbef34..5cdbf098074 100644 --- a/hw/s390x/ap-bridge.c +++ b/hw/s390x/ap-bridge.c @@ -10,7 +10,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/bitops.h" #include "qemu/module.h" #include "hw/s390x/ap-bridge.h" diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c index 887794beef7..440fefb7d0f 100644 --- a/hw/s390x/css-bridge.c +++ b/hw/s390x/css-bridge.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "hw/core/hotplug.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/bitops.h" #include "qemu/module.h" #include "hw/s390x/css.h" diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 9da6119be26..933271431ba 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -25,7 +25,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/scsi/esp.h" diff --git a/hw/scsi/lasi_ncr710.c b/hw/scsi/lasi_ncr710.c index 7e0076c7a3b..4fde2265b5b 100644 --- a/hw/scsi/lasi_ncr710.c +++ b/hw/scsi/lasi_ncr710.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "hw/scsi/lasi_ncr710.h" #include "hw/scsi/ncr53c710.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/scsi/ncr53c710.c b/hw/scsi/ncr53c710.c index 9931fd4dc7d..0f8914d353d 100644 --- a/hw/scsi/ncr53c710.c +++ b/hw/scsi/ncr53c710.c @@ -29,7 +29,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/scsi/scsi.h" #include "hw/scsi/ncr53c710.h" #include "migration/vmstate.h" diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index 267b723e3c5..020429aa4f4 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -23,7 +23,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/omap.h" #include "hw/sd/sd.h" =20 diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 761b262d7ba..08c34fea31d 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -9,7 +9,7 @@ =20 #include "qemu/osdep.h" #include "system/blockdev.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/sd/sd.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 35db5cbbcd1..acb3fe75a8b 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -28,7 +28,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sh4/sh.h" #include "system/reset.h" #include "system/runstate.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index a0aa89ad318..3ae71f99fe5 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -25,7 +25,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/sh4/sh.h" #include "system/system.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 2e3952c917b..8ad4eb46bbe 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -28,7 +28,7 @@ #include "qemu/datadir.h" #include "cpu.h" #include "exec/target_page.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/error-report.h" #include "qemu/timer.h" #include "hw/sparc/sun4m_iommu.h" diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c index 10c4786dad6..ab5eb67072a 100644 --- a/hw/sparc/sun4m_iommu.c +++ b/hw/sparc/sun4m_iommu.c @@ -26,7 +26,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/sparc/sun4m_iommu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "system/address-spaces.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 14b47c037ba..d3ce32b6b09 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -51,7 +51,7 @@ #include "hw/nvram/chrp_nvram.h" #include "hw/sparc/sparc64.h" #include "hw/nvram/fw_cfg.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ide/pci.h" #include "hw/core/loader.h" #include "hw/core/fw-path-provider.h" diff --git a/hw/sparc64/sun4u_iommu.c b/hw/sparc64/sun4u_iommu.c index 14645f475a0..0188ce35d29 100644 --- a/hw/sparc64/sun4u_iommu.c +++ b/hw/sparc64/sun4u_iommu.c @@ -25,7 +25,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sparc/sun4u_iommu.h" #include "system/address-spaces.h" #include "qemu/log.h" diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 6bef856c620..b9d5ecba292 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/block/flash.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c index 1851118d55f..715a2d21f4e 100644 --- a/hw/ssi/pl022.c +++ b/hw/ssi/pl022.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/ssi/pl022.h" diff --git a/hw/ssi/sifive_spi.c b/hw/ssi/sifive_spi.c index 577cd5d2d8b..2ece78053b2 100644 --- a/hw/ssi/sifive_spi.c +++ b/hw/ssi/sifive_spi.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ssi/ssi.h" #include "qemu/fifo8.h" #include "qemu/log.h" diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index cf406d08246..79f3e8bfae3 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -26,7 +26,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/fifo8.h" diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index a56a5e304dc..a4718fb72d9 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" #include "hw/core/qdev-properties.h" diff --git a/hw/ssi/xlnx-versal-ospi.c b/hw/ssi/xlnx-versal-ospi.c index 93cdc9d3999..467f0ce7033 100644 --- a/hw/ssi/xlnx-versal-ospi.c +++ b/hw/ssi/xlnx-versal-ospi.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" #include "qemu/bitops.h" diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index d52669787ee..bb995313ae0 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/timer/allwinner-a10-pit.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index c38e56f5b89..fb70333c538 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -8,7 +8,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "hw/core/irq.h" diff --git a/hw/timer/armv7m_systick.c b/hw/timer/armv7m_systick.c index baba0817b8f..65cfaf49142 100644 --- a/hw/timer/armv7m_systick.c +++ b/hw/timer/armv7m_systick.c @@ -13,7 +13,7 @@ #include "hw/timer/armv7m_systick.h" #include "migration/vmstate.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-clock.h" #include "qemu/timer.h" #include "qemu/log.h" diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index 20adb7decbe..1e954f7aec5 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/timer/aspeed_timer.h" #include "migration/vmstate.h" #include "qemu/bitops.h" diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c index 6f02c6a02d9..3d53921cfaf 100644 --- a/hw/timer/cadence_ttc.c +++ b/hw/timer/cadence_ttc.c @@ -18,7 +18,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c index 39b1fa3a149..0f57f01aad9 100644 --- a/hw/timer/cmsdk-apb-dualtimer.c +++ b/hw/timer/cmsdk-apb-dualtimer.c @@ -21,7 +21,7 @@ #include "trace.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/registerfields.h" diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c index e8b6601097c..4717cec0464 100644 --- a/hw/timer/cmsdk-apb-timer.c +++ b/hw/timer/cmsdk-apb-timer.c @@ -32,7 +32,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/registerfields.h" #include "hw/core/qdev-clock.h" diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c index 12b79914df0..352132bf214 100644 --- a/hw/timer/digic-timer.c +++ b/hw/timer/digic-timer.c @@ -27,7 +27,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "qemu/module.h" #include "qemu/log.h" diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index f6527a451b6..0424539c78f 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -54,7 +54,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/module.h" diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c index 1643fa39418..64eb4f5c8d7 100644 --- a/hw/timer/exynos4210_pwm.c +++ b/hw/timer/exynos4210_pwm.c @@ -22,7 +22,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/module.h" diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index dbce6f736fa..099ab6c5866 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -26,7 +26,7 @@ =20 #include "qemu/osdep.h" #include "hw/timer/grlib_gptimer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 82006df0e34..070b40e7f67 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -31,7 +31,7 @@ #include "qemu/timer.h" #include "hw/core/qdev-properties.h" #include "hw/timer/hpet.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/rtc/mc146818rtc.h" #include "hw/rtc/mc146818rtc_regs.h" #include "migration/vmstate.h" diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index b875c050525..b4f501e57fe 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -12,7 +12,7 @@ #include "hw/core/qdev-properties.h" #include "qemu/timer.h" #include "system/runstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 07359a6fe70..71696a4b615 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -27,7 +27,7 @@ #include "hw/core/irq.h" #include "hw/core/ptimer.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "trace.h" #include "qemu/module.h" diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c index 39d140347e5..bec3333b0d8 100644 --- a/hw/timer/sse-counter.c +++ b/hw/timer/sse-counter.c @@ -32,7 +32,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/timer/sse-counter.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/registerfields.h" #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c index 62381e07e06..ea607118922 100644 --- a/hw/timer/sse-timer.c +++ b/hw/timer/sse-timer.c @@ -40,7 +40,7 @@ #include "trace.h" #include "hw/timer/sse-timer.h" #include "hw/timer/sse-counter.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/registerfields.h" #include "hw/core/clock.h" diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index 9c2969a2c4f..8a502dae0ee 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -27,7 +27,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" #include "hw/core/qdev-properties.h" diff --git a/hw/tpm/tpm_tis_i2c.c b/hw/tpm/tpm_tis_i2c.c index 5ce84dc7a45..9f13e0ec120 100644 --- a/hw/tpm/tpm_tis_i2c.c +++ b/hw/tpm/tpm_tis_i2c.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "hw/i2c/i2c.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/acpi/tpm.h" #include "migration/vmstate.h" #include "tpm_prop.h" diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c index 07c30401301..e9372e73163 100644 --- a/hw/tpm/tpm_tis_sysbus.c +++ b/hw/tpm/tpm_tis_sysbus.c @@ -27,7 +27,7 @@ #include "migration/vmstate.h" #include "hw/acpi/tpm.h" #include "tpm_prop.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "tpm_tis.h" #include "qom/object.h" =20 diff --git a/hw/tricore/tc27x_soc.c b/hw/tricore/tc27x_soc.c index e1a97a43874..5b1b07cee1c 100644 --- a/hw/tricore/tc27x_soc.c +++ b/hw/tricore/tc27x_soc.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/loader.h" #include "qemu/units.h" #include "hw/misc/unimp.h" diff --git a/hw/tricore/tricore_testdevice.c b/hw/tricore/tricore_testdevic= e.c index d3ffc5fe9f3..2eb16731e90 100644 --- a/hw/tricore/tricore_testdevice.c +++ b/hw/tricore/tricore_testdevice.c @@ -17,7 +17,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "hw/tricore/tricore_testdevice.h" =20 diff --git a/hw/uefi/var-service-sysbus.c b/hw/uefi/var-service-sysbus.c index 3bf93356506..75b07905184 100644 --- a/hw/uefi/var-service-sysbus.c +++ b/hw/uefi/var-service-sysbus.c @@ -7,7 +7,7 @@ #include "migration/vmstate.h" =20 #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" =20 #include "hw/uefi/hardware-info.h" #include "hw/uefi/var-service.h" diff --git a/hw/usb/hcd-dwc3.c b/hw/usb/hcd-dwc3.c index 4018d70f02f..785732fc978 100644 --- a/hw/usb/hcd-dwc3.c +++ b/hw/usb/hcd-dwc3.c @@ -28,7 +28,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "qemu/bitops.h" #include "qom/object.h" diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index bdbbaaa87a3..18b58f5fcbc 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -24,7 +24,7 @@ #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "hw/pci/pci_device.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-dma.h" #include "hw/core/qdev-properties.h" #include "trace.h" diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c index 350b0118997..1a2cf29bed8 100644 --- a/hw/usb/hcd-ohci-sysbus.c +++ b/hw/usb/hcd-ohci-sysbus.c @@ -25,7 +25,7 @@ #include "qemu/timer.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-dma.h" #include "hw/core/qdev-properties.h" #include "trace.h" diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index c771aafdd06..c7e9c719035 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -32,7 +32,7 @@ #include "qemu/timer.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-dma.h" #include "hw/core/qdev-properties.h" #include "trace.h" diff --git a/hw/usb/xlnx-usb-subsystem.c b/hw/usb/xlnx-usb-subsystem.c index e0dfdfdcbd1..9bf040c917b 100644 --- a/hw/usb/xlnx-usb-subsystem.c +++ b/hw/usb/xlnx-usb-subsystem.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "qemu/bitops.h" #include "qom/object.h" diff --git a/hw/usb/xlnx-versal-usb2-ctrl-regs.c b/hw/usb/xlnx-versal-usb2-= ctrl-regs.c index 33a7d7fbca0..15ea4384488 100644 --- a/hw/usb/xlnx-versal-usb2-ctrl-regs.c +++ b/hw/usb/xlnx-versal-usb2-ctrl-regs.c @@ -28,7 +28,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/register.h" #include "qemu/bitops.h" diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 54bd0c57b5f..0b0412b22f2 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -23,7 +23,7 @@ #include "standard-headers/linux/virtio_mmio.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/virtio/virtio.h" #include "migration/qemu-file-types.h" #include "qemu/host-utils.h" diff --git a/hw/vmapple/aes.c b/hw/vmapple/aes.c index a6e94610b85..553e688adbe 100644 --- a/hw/vmapple/aes.c +++ b/hw/vmapple/aes.c @@ -15,7 +15,7 @@ #include "crypto/aes.h" #include "crypto/cipher.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/vmapple/vmapple.h" #include "migration/vmstate.h" #include "qemu/cutils.h" diff --git a/hw/vmapple/bdif.c b/hw/vmapple/bdif.c index 5ccd3745819..4dc10c151d2 100644 --- a/hw/vmapple/bdif.c +++ b/hw/vmapple/bdif.c @@ -15,7 +15,7 @@ #include "qemu/module.h" #include "trace.h" #include "hw/vmapple/vmapple.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/block/block.h" #include "qapi/error.h" #include "system/block-backend.h" diff --git a/hw/vmapple/cfg.c b/hw/vmapple/cfg.c index 3d58a29f69d..2a3204f0ec2 100644 --- a/hw/vmapple/cfg.c +++ b/hw/vmapple/cfg.c @@ -11,7 +11,7 @@ =20 #include "qemu/osdep.h" #include "hw/vmapple/vmapple.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index 2ebd0f07bd3..b1379eafef3 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -29,7 +29,7 @@ #include "hw/core/irq.h" #include "hw/core/loader.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/usb/usb.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" diff --git a/hw/watchdog/allwinner-wdt.c b/hw/watchdog/allwinner-wdt.c index 68b600689a5..156f8235342 100644 --- a/hw/watchdog/allwinner-wdt.c +++ b/hw/watchdog/allwinner-wdt.c @@ -25,7 +25,7 @@ #include "qemu/units.h" #include "qemu/module.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/registerfields.h" #include "hw/watchdog/allwinner-wdt.h" #include "system/watchdog.h" diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watch= dog.c index ceae792580e..c474166cfcc 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "system/watchdog.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/registerfields.h" diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 930834bfcaf..26506f3c33f 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -15,7 +15,7 @@ #include "qemu/timer.h" #include "system/watchdog.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/watchdog/wdt_aspeed.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c index e3c51030f35..dfad2bc5085 100644 --- a/hw/xen/xen-bus.c +++ b/hw/xen/xen-bus.c @@ -10,7 +10,7 @@ #include "qemu/module.h" #include "qemu/uuid.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen-backend.h" #include "hw/xen/xen-legacy-backend.h" /* xen_be_init() */ diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index f9b0dd1513d..7977b527127 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" =20 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "qemu/main-loop.h" diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index a533f2bac3f..5e6f897429d 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -38,7 +38,7 @@ #include "exec/tswap.h" #include "hw/char/serial-mm.h" #include "net/net.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/block/flash.h" #include "chardev/char.h" #include "system/device_tree.h" diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 8e74e24c190..0bf514cb096 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -18,7 +18,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "monitor/hmp.h" #include "monitor/monitor.h" #include "monitor/qdev.h" diff --git a/hw/display/apple-gfx-mmio.m b/hw/display/apple-gfx-mmio.m index b83f5f4fe62..983fc1724a0 100644 --- a/hw/display/apple-gfx-mmio.m +++ b/hw/display/apple-gfx-mmio.m @@ -15,7 +15,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "block/aio-wait.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "apple-gfx.h" #include "trace.h" --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764249628; cv=none; d=zohomail.com; s=zohoarc; b=C4EczfisPeML+ERkkhHgXDS+0+bUhlP7+FXM8o0xzm3BW2Ix56zJSkyOVQaPS0Aug20WZZTnCLTp8pZMZmhEmmGU6S3BwKAuT39FSL5gDBN15WAEOUNG5TYMMebfCdkfJu8GfLn0d4zEW//+vqhiUb/dMLwaleMI0ezGAk1UwOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764249628; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=VrToXuxWMQX+VSlgPV4t+2UnY8wDDrkLi4Lyow0yjpk=; b=AbsQtjDkyYyD5zWFX7fsrbx+eX2VeBLi0kvXycVabVV6mGwnlPuE59rfAeFAr37D+0ovc6WatpERYIXNWHE/SxCluFOmGsfW/h1zcQJBgXcEwtMKoffZT0wdy7rhf5Rn5AzivBBAJZ5o4wkdZtZTFO8WZXd9ye8B8+u3rpB3wSs= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17642496281711023.0591492423994; Thu, 27 Nov 2025 05:20:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObt4-0005UY-6Y; Thu, 27 Nov 2025 08:18:18 -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 1vObr4-0002jx-RL for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:20 -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 1vObqy-0001Iw-Tv for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:13 -0500 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-548-YyZ5tEDqMCGvZQB6LLCpvw-1; Thu, 27 Nov 2025 08:16:05 -0500 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-b72a8546d73so103139966b.2 for ; Thu, 27 Nov 2025 05:16:05 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f5a7b4bcsm153020266b.71.2025.11.27.05.16.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:16:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VrToXuxWMQX+VSlgPV4t+2UnY8wDDrkLi4Lyow0yjpk=; b=fxars/F5Rg7SFg8NTTYEiXCCbH1Yz7UeOvy6ElXjE9Q0I1s4K0MGq7jjAGSjcsLYN3owei SYRkGhJRzPmmpweX2AudEp6ZzCzO84xbOHj37IaPqLkzFSc5iFddl6C3COS9cL5Zwu5lOw A3RnvNGvYT12N5QtJIVp9WlEWHeUS7w= X-MC-Unique: YyZ5tEDqMCGvZQB6LLCpvw-1 X-Mimecast-MFC-AGG-ID: YyZ5tEDqMCGvZQB6LLCpvw_1764249364 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249363; x=1764854163; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VrToXuxWMQX+VSlgPV4t+2UnY8wDDrkLi4Lyow0yjpk=; b=q0IUO1rHIgUe1eWpHcj7Dkx5NJrWZR2u2rOJkHekMrWEqcu0xWPeD43HQY0yDMDUEB zQdA4N1jB1a+Omcncmh8G4wABVyqy3Ntf63e1TGL3XMI5FEcXDZ+lQ7XxncwZ5kVjmS3 83Uk8xfs+fe3NXnIhSlIAmooMKR1DarMexkgvC7GtiLWeiHW9MKNVjK/7qYy75t+6AVi DYW7Xk/BTlx85EE2NFzNLnXvBuNWIPwxQ9EoC6OTz9gCXG0F/Inb7VknazPXt9eK2asm OVqmA4rgPVSL+U0Cf777pAleIMr1nvRrplGflbfYZa3MtWJDzBIWWFAoOeDYZxS2qnqk 6CYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249363; x=1764854163; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=VrToXuxWMQX+VSlgPV4t+2UnY8wDDrkLi4Lyow0yjpk=; b=dkKNWsysbmG6SDfEU8A0YXkaW3LxX59y4QLOBHakMqGBktH6WmjyM216KZOuIdEIl1 nRE8oEJLKE9Fb9OsW03KmZhzGK9LBWY+rajDyi86uGOd6G0w4iEs8M1AR7kwQuDJKo4z jGCG3UPe1VjpvatsTOzb5mYWqvL3QsGBOXA5vws5sHfL8+Vn1sFhOEqRxdjlYKR0OIUS iiOwmMqcTFnerhv1vTIExqQ1LuJPrhO1BXVcmJ2RlsCM+6clp0zd63uON14JasrEfnPk rIU+6dKeNH3gui+mHaZIsH43Tl/5jSn23H47FwgUeEAiKiPJSncjMryp79+0TneYyAnS QoXQ== X-Gm-Message-State: AOJu0YyE6Sj4jFRQDIbLzPugXn2Evtdu30PF9+hULhXL1tCvWA7ZSsf2 qKZtyH2KKlA4h1Q6PhudwO3cfOL8KlbmbDApCKgK8rFw810YYLRvUuZoMRo6MZjyFP+tKQIZxdt DTGQDynXMhqZ/LgA5fr0tzpR/GZUkMi2wppOxHOUAXHmCevZaiS6EfWHmsZ1Rw3cDkH5FEogk89 146Gh6B4QwzTJGOs3dRguz81oR3AM4zXjxj8F8+I4/ X-Gm-Gg: ASbGncuABcmYJBhpT0yo9YcEtoyzAYH0bqrgQmWzB+KlacwQM6ymqjSvrhDOrhcpr48 08sSH5NtS4RcefS1Bcp6NlxrVFHyrI3ABzzUfxq625sMlNvpAE+7abKAnkadCAVIcn2SYvX9n06 i4UaPebErHqYX5GTii7Uet5PcdzZkAAX78HXIqzMfHl3SiWkFOxTEIytXYSJdW3uIMHmlKs/ZCn bfbgoeXcmF76vLRi+9NwDIo4P3RHj66b5yrAgBSJFpiF24w5o8c/uqUT/1DlXbbHIZy3CedhABs MjBUvrdKMr+6NsichOT18qb/chhtmLATeyHCr7Dn0xZo9TlUgjBYteIFRXd430M5GTTq4UHZ4/G fNdLv5nBVXs/U3Ok5qgiybpXgWRou27lLOQXCIfse+WWbRWr8y+3pNbo+JFfVmU+HQfy6ytP81V t9dnJl5XaDVJ/zmW8= X-Received: by 2002:a17:907:968c:b0:b3c:8940:6239 with SMTP id a640c23a62f3a-b7671b12672mr2645630666b.52.1764249363399; Thu, 27 Nov 2025 05:16:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IFR4zAUtB4DxYLxMVzjdn/2JS54LebqOs/4YoSUFB6HoNTN8BB+vMQ0qzr1abDd27DwPQ4zSg== X-Received: by 2002:a17:907:968c:b0:b3c:8940:6239 with SMTP id a640c23a62f3a-b7671b12672mr2645625766b.52.1764249362929; Thu, 27 Nov 2025 05:16:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 26/28] include: move hw/vmstate-if.h to hw/core/ Date: Thu, 27 Nov 2025 14:15:13 +0100 Message-ID: <20251127131516.80807-27-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764249629657019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- MAINTAINERS | 2 +- include/hw/{ =3D> core}/vmstate-if.h | 0 include/migration/register.h | 2 +- include/migration/vmstate.h | 2 +- hw/core/vmstate-if.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename include/hw/{ =3D> core}/vmstate-if.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 72c70a46553..0a70bc03889 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3656,7 +3656,7 @@ M: Peter Xu M: Fabiano Rosas S: Maintained F: hw/core/vmstate-if.c -F: include/hw/vmstate-if.h +F: include/hw/core/vmstate-if.h F: include/migration/ F: include/qemu/userfaultfd.h F: migration/ diff --git a/include/hw/vmstate-if.h b/include/hw/core/vmstate-if.h similarity index 100% rename from include/hw/vmstate-if.h rename to include/hw/core/vmstate-if.h diff --git a/include/migration/register.h b/include/migration/register.h index ae79794cdd4..d0f37f5f438 100644 --- a/include/migration/register.h +++ b/include/migration/register.h @@ -14,7 +14,7 @@ #ifndef MIGRATION_REGISTER_H #define MIGRATION_REGISTER_H =20 -#include "hw/vmstate-if.h" +#include "hw/core/vmstate-if.h" =20 /** * struct SaveVMHandlers: handler structure to finely control diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index df57e6550a2..84775474277 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -27,7 +27,7 @@ #ifndef QEMU_VMSTATE_H #define QEMU_VMSTATE_H =20 -#include "hw/vmstate-if.h" +#include "hw/core/vmstate-if.h" =20 typedef struct VMStateInfo VMStateInfo; typedef struct VMStateField VMStateField; diff --git a/hw/core/vmstate-if.c b/hw/core/vmstate-if.c index bf453620fed..c39631c7586 100644 --- a/hw/core/vmstate-if.c +++ b/hw/core/vmstate-if.c @@ -7,7 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/vmstate-if.h" +#include "hw/core/vmstate-if.h" =20 static const TypeInfo vmstate_if_info =3D { .name =3D TYPE_VMSTATE_IF, --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764249598; cv=none; d=zohomail.com; s=zohoarc; b=D/BCl9PJ8zzpXcO+bktPLH77suWnSh6WMI/o9g1Bdd8OUEJCJQ04P5LUhDPrJ4exch2SPXn1W6KCYR+zZ1kYHWBAv4jj0YBROJe/Gh9F24vZDwRCSpBwBWnDYRH0LAl5OFqNpsY8LTnCtgN8QmsGk/DbCgxFu5EOqS86nMXyoxY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764249598; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=osLpdyomL1kLDOW62zjri3pzkHGpZdG1pApBmgLdITo=; b=KRAWyc1CoDobT8+lJ1wvuIrdbhhzqTjxo8lV2WYK0HcQBLW22el8cABGpeABB/NhnPQQu45ql5a9lEn0YjXKEthUiHStsWbVsBLbr6OEgyyXaaglW6kYQ+DwSetMg8RtXkjEcn5IvjScVzGkvMzHoZhhHSuzHKh7O/a4foqACcg= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764249598484224.47740041235033; Thu, 27 Nov 2025 05:19:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObt4-0005VX-9Z; Thu, 27 Nov 2025 08:18:19 -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 1vObr6-0002k2-P2 for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vObr0-0001J8-Vt for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:16 -0500 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-113-1znOJPIDNN-GPHfoZlAcnw-1; Thu, 27 Nov 2025 08:16:07 -0500 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-b70b974b818so77265666b.1 for ; Thu, 27 Nov 2025 05:16:07 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f51721b6sm162860566b.5.2025.11.27.05.16.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:16:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=osLpdyomL1kLDOW62zjri3pzkHGpZdG1pApBmgLdITo=; b=aYx3II8wKG7P5pb/YIBrVc6Kfv8swy6fwq4cdrbeMdAl4paFN4UzZH2DxsuMLM2qaVw3v8 m1javGFMjesSgaTp7Q82FvX0REPj67Rdp4zpYZ4hpos61Pr4x8U8bTxyZ3jeb5n1kq11ri 2HISRicNU1CkDC58g0zZhZbbsNvbnyk= X-MC-Unique: 1znOJPIDNN-GPHfoZlAcnw-1 X-Mimecast-MFC-AGG-ID: 1znOJPIDNN-GPHfoZlAcnw_1764249367 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249366; x=1764854166; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=osLpdyomL1kLDOW62zjri3pzkHGpZdG1pApBmgLdITo=; b=JXw6Bs+sIG+59d78eyeyFoM/DzwCZ8KabfwF+Wn0fIJ3NL3WSoblonqC46yrs4WWZj tWJ4pj/E56B6Z7Ow6iBfAJi8XSdBzXAoqP5pKL1WHdlGaA+bLMqmXn3nkCbC4PumOQOw Xo6Nk2hEyiAeyDr9OZdamjZdQTI8cejF4v+t/wCGMbV/FljE6KQkRbfQEzUK+2Zg929l fKQ1C6nK6AVE6jiEtejIavE/HkPA17yDn9R5JUIRpWyIRH827n0i0F/tTSF4bLGiEfWE /EsUwSCGGjA4TKWMOzbYVWW28rxfLGQo3iYRWhfFqIBNu7jkaBeXz0+sw7XrlSxvNC5E jXTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249366; x=1764854166; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=osLpdyomL1kLDOW62zjri3pzkHGpZdG1pApBmgLdITo=; b=eNQx5unadG00uOutZDDq5aKdVz2TvfWHIEaJpu8m+gEP4BmQBDZj666HK0dgtKmI2k pQTSIw03svOK2+SUI/kmA9THt1GICTssiuS5SWwfSQeBuxk0ZMOtDHDWne8jWsuHMld9 tzJoRuS7rRxCcVaPVUI81XIDpCIJI7P4qm+w8IJZNXYBspkmCWO76cmDx0KdkXSPLvr2 TdtsrN2Ay1qk4n0ycqaAdoiCXCKt8DDmBC4abTmbfO8Q7trNcPIoGCdQ8L8yXgq3Otso gfBauPMurlzRXVj2io2pONw7tjsxx3U/byVNJELTEEOnPwl94w4rzmv287rhXsYICm6v hdrA== X-Gm-Message-State: AOJu0YxLz29aKM1/m2QYWdbRbPbXteG13javE3JTyMCMhVcWIkvnhUZT PMuePYuwK3gjoGb4gFemmUsnDbXZeQ+wNKCBgqgikoVLDLKCkZfdJHMCuwl5j806/ue3iovyemL BDjOgiXOxP5F2/6wxbhY0lxYcEElAeMGYKTkGew+R+YVWZY5dXDgTYlUafjDNlzJRx2HG9S1Y6n 3IeJwXdw1m31Hi1+q9TXCV8QhYfEBHb5/vUeccHzmC X-Gm-Gg: ASbGnct9QHB6JQknGmGA1Xj4eRDrbbapIhGW9Ei6X7yqzCbyt3bJOVJz5/bJN6P0AjT tp8iPaTj63SueKRjt0VcNKocf1sv4IYngG5xSlwXxADXiju/PFN71TLj0ghto41SPFN2wfX5arN JwSfMKgGXAnHXvR1FVrS1BpediTG4hzLmEbKWRO3M0f/q9kdfTkuh19+jyN6GpuYMddJoUZM1CK WN1BHcP15laPZUskkTOlRYVdTB4DMoLh+lB4LDKOLg4GibthgsOE+q2rmitMG1HC9hWysL9pR/C 8Q1lOK+3iOZfHcCVY6QPYU2hmQi2mJ6RgMC4T7rmg0/urVS6TLKpnokYQoUHc/guarI1Y9Wnosi yjobt3TF2GBcmwRpVdJKpsrWESO3HpZG26iSLX8cjlTU5zxuuuDUYezTPOVvo7GFv4yx54ar5UO qPobzZ7QLJvD5qsD0= X-Received: by 2002:a17:907:968c:b0:b3c:8940:6239 with SMTP id a640c23a62f3a-b7671b12672mr2645651166b.52.1764249365801; Thu, 27 Nov 2025 05:16:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFxnjLD2zswcEFH6KoF41qgXdt7eW78+4OGnrKgPy2H2fDIuCMJXXwa3ogW1DOMlNIEOQ3DGw== X-Received: by 2002:a17:907:968c:b0:b3c:8940:6239 with SMTP id a640c23a62f3a-b7671b12672mr2645643766b.52.1764249365027; Thu, 27 Nov 2025 05:16:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 27/28] include: move hw/hw.h to hw/core/, rename Date: Thu, 27 Nov 2025 14:15:14 +0100 Message-ID: <20251127131516.80807-28-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764249599675019200 Content-Type: text/plain; charset="utf-8" Call it include/hw/core/hw-error.h since that is the only thing it contains. Signed-off-by: Paolo Bonzini --- include/hw/{hw.h =3D> core/hw-error.h} | 0 hw/arm/integratorcp.c | 2 +- hw/arm/omap1.c | 2 +- hw/arm/xen-stubs.c | 2 +- hw/audio/lm4549.c | 2 +- hw/core/loader.c | 2 +- hw/display/bcm2835_fb.c | 2 +- hw/display/exynos4210_fimd.c | 2 +- hw/display/g364fb.c | 2 +- hw/dma/pl080.c | 2 +- hw/dma/xilinx_axidma.c | 2 +- hw/i386/xen/xen-hvm.c | 2 +- hw/intc/exynos4210_combiner.c | 2 +- hw/misc/omap_clk.c | 2 +- hw/net/e1000e.c | 2 +- hw/net/igb.c | 2 +- hw/net/igbvf.c | 2 +- hw/net/vmxnet3.c | 2 +- hw/net/xilinx_axienet.c | 2 +- hw/ppc/ppce500_spin.c | 2 +- hw/timer/a9gtimer.c | 2 +- hw/timer/arm_mptimer.c | 2 +- hw/vfio/device.c | 2 +- hw/vfio/helpers.c | 2 +- hw/vfio/igd.c | 2 +- hw/vfio/listener.c | 2 +- hw/vfio/migration.c | 2 +- hw/vfio/pci.c | 2 +- hw/vfio/region.c | 2 +- hw/vfio/spapr.c | 2 +- hw/xen/xen-hvm-common.c | 2 +- system/cpus.c | 2 +- target/ppc/kvm.c | 2 +- target/ppc/mmu-hash64.c | 2 +- target/s390x/mmu_helper.c | 2 +- scripts/analyze-inclusions | 10 +++++----- 36 files changed, 39 insertions(+), 39 deletions(-) rename include/hw/{hw.h =3D> core/hw-error.h} (100%) diff --git a/include/hw/hw.h b/include/hw/core/hw-error.h similarity index 100% rename from include/hw/hw.h rename to include/hw/core/hw-error.h diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 118808f2dc7..0bf519b6bb8 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -23,7 +23,7 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "hw/char/pl011.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/sd/sd.h" #include "qom/object.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index f3d6be1e295..f5ff4b107ae 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -24,7 +24,7 @@ #include "qapi/error.h" #include "cpu.h" #include "system/address-spaces.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/arm/boot.h" diff --git a/hw/arm/xen-stubs.c b/hw/arm/xen-stubs.c index 6a830435533..00bc310252f 100644 --- a/hw/arm/xen-stubs.c +++ b/hw/arm/xen-stubs.c @@ -7,7 +7,7 @@ #include "qemu/osdep.h" #include "qapi/qapi-commands-migration.h" #include "system/xen.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/xen/xen-hvm-common.h" #include "hw/xen/arch_hvm.h" =20 diff --git a/hw/audio/lm4549.c b/hw/audio/lm4549.c index bf711c49c04..f85226d1ac5 100644 --- a/hw/audio/lm4549.c +++ b/hw/audio/lm4549.c @@ -14,7 +14,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "qemu/log.h" #include "qemu/audio.h" #include "lm4549.h" diff --git a/hw/core/loader.c b/hw/core/loader.c index 40cb187a113..8252616fdd3 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -50,7 +50,7 @@ #include "qapi/type-helpers.h" #include "qemu/units.h" #include "trace.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "disas/disas.h" #include "migration/cpr.h" #include "migration/vmstate.h" diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index 8eec0dc600b..75d7c0f8499 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/display/bcm2835_fb.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "ui/console.h" #include "framebuffer.h" diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 7f841b88047..a97054132fb 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -24,7 +24,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/qdev-properties.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 2eefafcaf67..50952e9934b 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "qapi/error.h" diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index 514206b7c31..3f8acb03deb 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -13,7 +13,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/dma/pl080.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "qapi/error.h" diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 8488f125b5f..22dec8b3eb2 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -26,7 +26,7 @@ #include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/timer.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" #include "hw/core/qdev-properties.h" diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 591da26d453..a6e1683885a 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -15,7 +15,7 @@ #include "qapi/qapi-commands-migration.h" #include "trace.h" =20 -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/i386/pc.h" #include "hw/core/irq.h" #include "hw/i386/apic-msidef.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index ec935a084db..e8cac331e4c 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -33,7 +33,7 @@ #include "qemu/module.h" #include "hw/intc/exynos4210_combiner.h" #include "hw/arm/exynos4210.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "qom/object.h" diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c index 37afef09903..e927ef22a09 100644 --- a/hw/misc/omap_clk.c +++ b/hw/misc/omap_clk.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/arm/omap.h" =20 diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 3d4683370c6..9faf0c74c3d 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -41,7 +41,7 @@ #include "qemu/module.h" #include "qemu/range.h" #include "system/system.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/net/mii.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" diff --git a/hw/net/igb.c b/hw/net/igb.c index d39eba9f64d..c076807e711 100644 --- a/hw/net/igb.c +++ b/hw/net/igb.c @@ -45,7 +45,7 @@ #include "qemu/module.h" #include "qemu/range.h" #include "system/system.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/net/mii.h" #include "hw/pci/pci.h" #include "hw/pci/pcie.h" diff --git a/hw/net/igbvf.c b/hw/net/igbvf.c index 9b0db8f8411..48d56e43aca 100644 --- a/hw/net/igbvf.c +++ b/hw/net/igbvf.c @@ -38,7 +38,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/net/mii.h" #include "hw/pci/pci_device.h" #include "hw/pci/pcie.h" diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index bae3a44cb0c..97156dd33b9 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -16,7 +16,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/pci/pci.h" #include "hw/core/qdev-properties.h" #include "net/tap.h" diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 29c09b88ebf..d85f8bb23fe 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c index a066ada77ed..85bdcac43a1 100644 --- a/hw/ppc/ppce500_spin.c +++ b/hw/ppc/ppce500_spin.c @@ -30,7 +30,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qemu/units.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/sysbus.h" #include "system/hw_accel.h" #include "hw/ppc/ppc.h" diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index a2363a89a5f..3a086915c81 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -21,7 +21,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/timer/a9gtimer.h" diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index 869db913d40..88158144b23 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -20,7 +20,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" #include "hw/core/qdev-properties.h" diff --git a/hw/vfio/device.c b/hw/vfio/device.c index 76869828fc8..19d1236ed75 100644 --- a/hw/vfio/device.c +++ b/hw/vfio/device.c @@ -23,7 +23,7 @@ =20 #include "hw/vfio/vfio-device.h" #include "hw/vfio/pci.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "trace.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c index 23d13e5db5f..2cbc7b4964f 100644 --- a/hw/vfio/helpers.c +++ b/hw/vfio/helpers.c @@ -24,7 +24,7 @@ =20 #include "system/kvm.h" #include "hw/vfio/vfio-device.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "qapi/error.h" #include "vfio-helpers.h" =20 diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c index cff413c16f5..6aacf27284f 100644 --- a/hw/vfio/igd.c +++ b/hw/vfio/igd.c @@ -16,7 +16,7 @@ #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "hw/core/boards.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/nvram/fw_cfg.h" #include "pci.h" #include "pci-quirks.h" diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c index 2d7d3a46457..7af01075359 100644 --- a/hw/vfio/listener.c +++ b/hw/vfio/listener.c @@ -30,7 +30,7 @@ #include "hw/vfio/pci.h" #include "system/address-spaces.h" #include "system/memory.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/range.h" diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 4c06e3db936..fde343f06e3 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -30,7 +30,7 @@ #include "exec/ramlist.h" #include "pci.h" #include "trace.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "vfio-migration-internal.h" =20 /* diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index a0a66b105aa..c7344727214 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -23,7 +23,7 @@ #include #include =20 -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/pci/pci_bridge.h" diff --git a/hw/vfio/region.c b/hw/vfio/region.c index b165ab0b937..ca75ab1be4d 100644 --- a/hw/vfio/region.c +++ b/hw/vfio/region.c @@ -23,7 +23,7 @@ =20 #include "hw/vfio/vfio-region.h" #include "hw/vfio/vfio-device.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "trace.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index 0f23681a3f9..a9f093c3570 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -16,7 +16,7 @@ #include "system/address-spaces.h" =20 #include "hw/vfio/vfio-container-legacy.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index 5d11b50db9c..59c73dfaeb5 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -7,7 +7,7 @@ #include "exec/target_page.h" #include "trace.h" =20 -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/pci/pci_host.h" #include "hw/xen/xen-hvm-common.h" #include "hw/xen/xen-bus.h" diff --git a/system/cpus.c b/system/cpus.c index a0e1debfea8..49deeb9468a 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -45,7 +45,7 @@ #include "system/cpu-timers.h" #include "system/whpx.h" #include "hw/core/boards.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "trace.h" =20 #ifdef CONFIG_LINUX diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 43124bf1c78..2c96eca584e 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -34,7 +34,7 @@ =20 #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_cpu_core.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/ppc/ppc.h" #include "migration/qemu-file-types.h" #include "system/watchdog.h" diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c index dd337558aa6..d026abadd11 100644 --- a/target/ppc/mmu-hash64.c +++ b/target/ppc/mmu-hash64.c @@ -28,7 +28,7 @@ #include "kvm_ppc.h" #include "mmu-hash64.h" #include "exec/log.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "internal.h" #include "mmu-book3s-v3.h" #include "mmu-books.h" diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 7a7b3810590..7063f1a905f 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -26,7 +26,7 @@ #include "system/memory.h" #include "exec/page-protection.h" #include "exec/target_page.h" -#include "hw/hw.h" +#include "hw/core/hw-error.h" #include "hw/s390x/storage-keys.h" #include "hw/core/boards.h" =20 diff --git a/scripts/analyze-inclusions b/scripts/analyze-inclusions index d2c566667df..50a7d95d9e7 100644 --- a/scripts/analyze-inclusions +++ b/scripts/analyze-inclusions @@ -46,7 +46,7 @@ grep_include() { } =20 echo Found $(find . -name "*.d" | wc -l) object files -echo $(grep_include -F 'hw/hw.h') files include hw/hw.h +echo $(grep_include -F 'hw/core/hw-error.h') files include hw/core/hw-erro= r.h echo $(grep_include 'target/[a-z0-9]*/cpu\.h') files include cpu.h echo $(grep_include -F 'qapi-types.h') files include qapi-types.h echo $(grep_include -F 'trace/generated-tracers.h') files include generate= d-tracers.h @@ -85,8 +85,8 @@ analyze() { echo osdep.h: analyze ../include/qemu/osdep.h =20 -echo hw/hw.h: -analyze -include ../include/qemu/osdep.h ../include/hw/hw.h +echo hw/core/hw-error.h: +analyze -include ../include/qemu/osdep.h ../include/hw/core/hw-error.h =20 echo trace/generated-tracers.h: analyze -include ../include/qemu/osdep.h trace/generated-tracers.h @@ -94,5 +94,5 @@ analyze -include ../include/qemu/osdep.h trace/generated-= tracers.h echo target/i386/cpu.h: analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ..= /include/qemu/osdep.h ../target/i386/cpu.h =20 -echo hw/hw.h + COMPILING_PER_TARGET: -analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ..= /include/qemu/osdep.h ../include/hw/hw.h +echo hw/core/hw-error.h + COMPILING_PER_TARGET: +analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ..= /include/qemu/osdep.h ../include/hw/core/hw-error.h --=20 2.51.1 From nobody Sat Nov 29 10:17:00 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764249567; cv=none; d=zohomail.com; s=zohoarc; b=ZoCv5rtEm1hGlmcWAXEMksYMuW0VYj+VMvtJd8kOL5Ogk/wftzxNhVOMYD/udMdZZ7zicWmYscbf7SdNfmhYFMIv2wLODbo8td0oc+dNMda+zc5u9GceMbCF+NUfuL+5qFUscxccGLw9mtqXXljVZ3U4+I6K/ri7H1wpp3QLKgI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764249567; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=qY+rQ8H8hkB4As/VQV6sKAHUnvXUagRrq1D5YbzHfpY=; b=aBu6RuKFP0JZFAzcB7yAVQ32yHkHjD9Yf1BCYEDbXhuWEH6B+xPO08CzDVNGxBqY13qUyiUVlo4v6ZLG9PycCfnOvaM58RQsFE/4jZ/BpRE8DY4gIZvHwHG+9lqQRj2tqYVwc19ymC4gkwP5XGINbEYKsmP+soOxCmqjbdhMzWY= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176424956733879.56924485920524; Thu, 27 Nov 2025 05:19:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vObtC-00069v-Lr; Thu, 27 Nov 2025 08:18:26 -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 1vObrC-0002rD-Gg for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vObr6-0001Js-GT for qemu-devel@nongnu.org; Thu, 27 Nov 2025 08:16:21 -0500 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-689-JCG7tl6rOq-Y4tZbizRejw-1; Thu, 27 Nov 2025 08:16:12 -0500 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-6450f3e7e71so808023a12.3 for ; Thu, 27 Nov 2025 05:16:11 -0800 (PST) Received: from [192.168.10.48] ([176.206.119.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-64751035c3bsm1463046a12.19.2025.11.27.05.16.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 05:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764249375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qY+rQ8H8hkB4As/VQV6sKAHUnvXUagRrq1D5YbzHfpY=; b=R3nI0AIHuFrZTTaW3mXZyDk1kNtI4OAAPs53/UlL2kJZFKW8WrZUw8E/ghmn5ow2Skz3XK sIkoyIfnXa1OKaQq6Zbkc7jtWg2uuKToEWNAnHgp5fRsAOOLTm9/rVAhYgshCF9PocxKFN xSRKTswySGCCaDDNrZo9wyAxod8kM34= X-MC-Unique: JCG7tl6rOq-Y4tZbizRejw-1 X-Mimecast-MFC-AGG-ID: JCG7tl6rOq-Y4tZbizRejw_1764249371 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764249370; x=1764854170; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qY+rQ8H8hkB4As/VQV6sKAHUnvXUagRrq1D5YbzHfpY=; b=edzh1Bbge/eMWG8wn1Ew0ZeLIr+b/RKc0xojWqtn7oxJHBPSAWw/dttFy1z0320+N8 DkrCmcuf2bX8BVT+qiBmzenmpP43rY5qBBat+tbjQK/jWvzEGYFg+zkGBoQ7QQaLfOJM 0jM+0wGCS6r3QwWOARqmFttTN4BpVRVmfSBqx1FIynzfHultboIleMynUtwFLGIGzjad qCgvzyIrnRq5c+/v3ouvmARTxH+qJWGNIx7f+tElWodMOA/v1oQ6i1DCITrIGij34e2v Q8Qog/2MvTcows43ulOF9frZiosoa4crDCoUqL67wTMeLBkZueuYGgcFCWi+B8UtLzMH Xpnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764249370; x=1764854170; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=qY+rQ8H8hkB4As/VQV6sKAHUnvXUagRrq1D5YbzHfpY=; b=wyfZPL23K73XmYWeNpRDtZgszUx8Cqi+nBvVOTMFFDpvcW7u+g79tHHa3Aq07YqPp5 8yOSdoiW/3X/0JgdHf5DSAn/Jmt05m3oNG9wfuCXoD540o/Mx8i5hTIBsBn5n+8jaGCI UmToHiCtbe8ZkeXGCggRghTz9A9gCleK1OlUMbNFxXkdue1cWWxVMl0H2l1AQpv5P7BG +45dS/kqVMAQ+xD7TgAM29jSMizcWETDqt0yTap2L5uW7mAB/4a8k1W0om0bQJ4HqETT 2eGA2AJSv+ChnabOmmmH9mwkYVo22jJetzNja9wIXVcZ2JTIxzq19zzDvE2qPJ6g/ukd /Sew== X-Gm-Message-State: AOJu0YzkP6hO2+Zykp52jDG20a+wsrSgUonhB9LUGtzNMy8AyABrAbDv xq+CaDUQ+WD+wRH03LkkK1EZ0k+5JJ6Zr2S+hZUMhHZlVLycc4vARoh6ha7ZZkYrxTTryM5V4HU 9LVUnE7113YzA1VBJDe6Vt6U16gIYgnW0h4CQmuM4wHUxs/bcOlJdTGhqIfqBMrV4QyPNR7Y+Xy CMvkXIymScW9fAsHfaoEPFw8YbvTEGTL7FY5I8tyyO X-Gm-Gg: ASbGncuzAJuSH9x3ZAjTCOaqaw6ayZo/mwmou1D/MWu7I1A2vVVj3yVSBuPwZHDo7md lehg2BQNJlyXpRGDMmQnfMOggz6eEXybdsmgRc7ZGkVuG/+YOt7MZlt73T2qBRLZMUpnzQV/3/6 z7IDLEGPtgtqJWkmXdlURXpHu8ozokKx1qZTo4saXD8ASMSEoBRQ6epbnsZve5de+9PgRyhDQTB dJSemdS6OERYKPhD0Oh+WCnn6OtXmYmcDd8kkMGQSHdjrbr+OCZkmCPmX39vhOEgmek7PzIp9rg I4SF1pCXzcrjY1vjUHVTGbkL1B1LPY0q4Wb3vdFt4ApPrW11bfFIiTDd3+aaeiE4zXsyjj/Wj+G 6jDBMwsx88SvDIVUFKcBNJQXpIJd6u0f1R97gmQ9hqqh+nvhtL/m6ZRf8hz2zclcSQonxz+7J6R gsPhlRqxbbgJ4iB7Q= X-Received: by 2002:a05:6402:280a:b0:645:d75d:3dc2 with SMTP id 4fb4d7f45d1cf-645eb258ff8mr10590707a12.10.1764249369191; Thu, 27 Nov 2025 05:16:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IHqkCUDjB3lw9dCLoae7m0naA3RaYuEeSfFWRYg+RPLXgokY7WxNZFkQXCOY0PtsHPoMN66PA== X-Received: by 2002:a05:6402:280a:b0:645:d75d:3dc2 with SMTP id 4fb4d7f45d1cf-645eb258ff8mr10590617a12.10.1764249367580; Thu, 27 Nov 2025 05:16:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 28/28] include: reorganize memory API headers Date: Thu, 27 Nov 2025 14:15:15 +0100 Message-ID: <20251127131516.80807-29-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251127131516.80807-1-pbonzini@redhat.com> References: <20251127131516.80807-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1764249569480019200 Signed-off-by: Paolo Bonzini --- MAINTAINERS | 2 +- include/exec/cpu-common.h | 76 +---------- include/hw/core/qdev-properties-system.h | 1 + include/hw/i2c/smbus_eeprom.h | 2 +- include/hw/xen/xen-hvm-common.h | 1 + include/system/balloon.h | 2 +- include/system/block-ram-registrar.h | 2 +- include/system/iommufd.h | 2 +- include/system/memory.h | 16 ++- include/system/memory_mapping.h | 4 +- include/system/physmem.h | 2 +- include/system/ram_addr.h | 136 +++---------------- include/system/ramblock.h | 160 ++++++++++++++++++++++- include/{exec =3D> system}/ramlist.h | 10 +- include/system/xen-mapcache.h | 1 - include/system/xen.h | 3 +- migration/migration.h | 3 +- accel/mshv/mshv-all.c | 1 + accel/tcg/cputlb.c | 2 +- accel/tcg/tcg-accel-ops-mttcg.c | 1 + backends/hostmem.c | 1 + block/blkio.c | 2 +- dump/dump.c | 1 + hw/acpi/ghes.c | 1 + hw/acpi/nvdimm.c | 1 + hw/acpi/vmgenid.c | 1 + hw/arm/omap1.c | 1 + hw/audio/marvell_88w8618.c | 1 + hw/char/riscv_htif.c | 1 + hw/core/cpu-common.c | 1 + hw/core/machine-qmp-cmds.c | 1 + hw/core/numa.c | 3 +- hw/display/exynos4210_fimd.c | 1 + hw/display/omap_lcdc.c | 1 + hw/display/ramfb.c | 1 + hw/display/vga.c | 1 + hw/dma/i8257.c | 1 + hw/dma/omap_dma.c | 1 + hw/dma/rc4030.c | 1 + hw/dma/sifive_pdma.c | 1 + hw/hyperv/hyperv.c | 1 + hw/hyperv/syndbg.c | 1 + hw/hyperv/vmbus.c | 1 + hw/i386/kvm/clock.c | 1 + hw/i386/vapic.c | 1 + hw/intc/apic.c | 1 + hw/intc/xive2.c | 1 + hw/m68k/next-cube.c | 1 + hw/microblaze/boot.c | 1 + hw/misc/pc-testdev.c | 1 + hw/net/fsl_etsec/rings.c | 1 + hw/net/mcf_fec.c | 1 + hw/net/opencores_eth.c | 1 + hw/net/xgmac.c | 1 + hw/nvram/spapr_nvram.c | 1 + hw/ppc/amigaone.c | 1 + hw/ppc/e500.c | 1 + hw/ppc/pegasos.c | 1 + hw/ppc/pnv.c | 1 + hw/ppc/ppc440_uc.c | 1 + hw/ppc/spapr.c | 1 + hw/ppc/spapr_drc.c | 1 + hw/ppc/spapr_events.c | 1 + hw/ppc/spapr_hcall.c | 1 + hw/ppc/spapr_rtas.c | 1 + hw/ppc/spapr_tpm_proxy.c | 1 + hw/ppc/virtex_ml507.c | 1 + hw/remote/proxy-memory-listener.c | 1 + hw/s390x/css.c | 1 + hw/s390x/ipl.c | 1 + hw/s390x/s390-pci-bus.c | 1 + hw/s390x/virtio-ccw.c | 1 + hw/scsi/vmw_pvscsi.c | 1 + hw/sparc/leon3.c | 1 + hw/vfio-user/container.c | 1 + hw/vfio/container.c | 2 +- hw/vfio/helpers.c | 1 + hw/vfio/migration.c | 2 +- hw/virtio/vhost.c | 1 + hw/xen/xen-mapcache.c | 1 + hw/xen/xen_pt_graphics.c | 1 + hw/xtensa/xtfpga.c | 1 + migration/ram.c | 2 +- stubs/physmem.c | 2 +- stubs/ram-block.c | 4 +- system/ioport.c | 1 + system/memory.c | 2 +- system/physmem.c | 2 +- target/arm/kvm.c | 1 + target/i386/kvm/kvm.c | 1 + target/i386/sev.c | 1 + target/ppc/kvm.c | 2 +- target/s390x/kvm/kvm.c | 2 +- util/vfio-helpers.c | 2 +- 94 files changed, 290 insertions(+), 226 deletions(-) rename include/{exec =3D> system}/ramlist.h (94%) diff --git a/MAINTAINERS b/MAINTAINERS index 0a70bc03889..dab02da37a7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3254,9 +3254,9 @@ R: Philippe Mathieu-Daud=C3=A9 S: Supported F: include/system/ioport.h F: include/exec/memop.h +F: include/exec/ram_addr.h F: include/system/memory.h F: include/system/physmem.h -F: include/system/ram_addr.h F: include/system/ramblock.h F: include/system/memory_mapping.h F: system/dma-helpers.c diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index e0be4ee2b8f..fba4d782e91 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -10,6 +10,8 @@ =20 #include "exec/vaddr.h" #include "exec/hwaddr.h" +#include "exec/hwaddr.h" +#include "system/ram_addr.h" #include "hw/core/cpu.h" #include "tcg/debug-assert.h" #include "exec/page-protection.h" @@ -38,69 +40,6 @@ int cpu_get_free_index(void); void tcg_iommu_init_notifier_list(CPUState *cpu); void tcg_iommu_free_notifier_list(CPUState *cpu); =20 -enum device_endian { - DEVICE_NATIVE_ENDIAN, - DEVICE_BIG_ENDIAN, - DEVICE_LITTLE_ENDIAN, -}; - -/* address in the RAM (different from a physical address) */ -#if defined(CONFIG_XEN_BACKEND) -typedef uint64_t ram_addr_t; -# define RAM_ADDR_MAX UINT64_MAX -# define RAM_ADDR_FMT "%" PRIx64 -#else -typedef uintptr_t ram_addr_t; -# define RAM_ADDR_MAX UINTPTR_MAX -# define RAM_ADDR_FMT "%" PRIxPTR -#endif - -/* memory API */ - -void qemu_ram_remap(ram_addr_t addr); -/* This should not be used by devices. */ -ram_addr_t qemu_ram_addr_from_host(void *ptr); -ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr); -RAMBlock *qemu_ram_block_by_name(const char *name); - -/* - * Translates a host ptr back to a RAMBlock and an offset in that RAMBlock. - * - * @ptr: The host pointer to translate. - * @round_offset: Whether to round the result offset down to a target page - * @offset: Will be set to the offset within the returned RAMBlock. - * - * Returns: RAMBlock (or NULL if not found) - * - * By the time this function returns, the returned pointer is not protected - * by RCU anymore. If the caller is not within an RCU critical section and - * does not hold the BQL, it must have other means of protecting the - * pointer, such as a reference to the memory region that owns the RAMBloc= k. - */ -RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset, - ram_addr_t *offset); -ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host); -void qemu_ram_set_idstr(RAMBlock *block, const char *name, DeviceState *de= v); -void qemu_ram_unset_idstr(RAMBlock *block); -const char *qemu_ram_get_idstr(RAMBlock *rb); -void *qemu_ram_get_host_addr(RAMBlock *rb); -ram_addr_t qemu_ram_get_offset(RAMBlock *rb); -ram_addr_t qemu_ram_get_fd_offset(RAMBlock *rb); -ram_addr_t qemu_ram_get_used_length(RAMBlock *rb); -ram_addr_t qemu_ram_get_max_length(RAMBlock *rb); -bool qemu_ram_is_shared(RAMBlock *rb); -bool qemu_ram_is_noreserve(RAMBlock *rb); -bool qemu_ram_is_uf_zeroable(RAMBlock *rb); -void qemu_ram_set_uf_zeroable(RAMBlock *rb); -bool qemu_ram_is_migratable(RAMBlock *rb); -void qemu_ram_set_migratable(RAMBlock *rb); -void qemu_ram_unset_migratable(RAMBlock *rb); -bool qemu_ram_is_named_file(RAMBlock *rb); -int qemu_ram_get_fd(RAMBlock *rb); - -size_t qemu_ram_pagesize(RAMBlock *block); -size_t qemu_ram_pagesize_largest(void); - /** * cpu_address_space_init: * @cpu: CPU to add this address space to @@ -139,17 +78,6 @@ void *cpu_physical_memory_map(hwaddr addr, void cpu_physical_memory_unmap(void *buffer, hwaddr len, bool is_write, hwaddr access_len); =20 -/* Coalesced MMIO regions are areas where write operations can be reordere= d. - * This usually implies that write operations are side-effect free. This = allows - * batching which can make a major impact on performance when using - * virtualization. - */ -void qemu_flush_coalesced_mmio_buffer(void); - -typedef int (RAMBlockIterFunc)(RAMBlock *rb, void *opaque); - -int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque); - /* vl.c */ void list_cpus(void); =20 diff --git a/include/hw/core/qdev-properties-system.h b/include/hw/core/qde= v-properties-system.h index ec39ef3bd6e..ec21732ce52 100644 --- a/include/hw/core/qdev-properties-system.h +++ b/include/hw/core/qdev-properties-system.h @@ -2,6 +2,7 @@ #define HW_QDEV_PROPERTIES_SYSTEM_H =20 #include "hw/core/qdev-properties.h" +#include "qapi/qapi-types-common.h" =20 bool qdev_prop_sanitize_s390x_loadparm(uint8_t *loadparm, const char *str, Error **errp); diff --git a/include/hw/i2c/smbus_eeprom.h b/include/hw/i2c/smbus_eeprom.h index 68b0063ab6f..61a54cda761 100644 --- a/include/hw/i2c/smbus_eeprom.h +++ b/include/hw/i2c/smbus_eeprom.h @@ -23,7 +23,7 @@ #ifndef HW_SMBUS_EEPROM_H #define HW_SMBUS_EEPROM_H =20 -#include "exec/cpu-common.h" +#include "system/ram_addr.h" #include "hw/i2c/i2c.h" =20 void smbus_eeprom_init_one(I2CBus *bus, uint8_t address, uint8_t *eeprom_b= uf); diff --git a/include/hw/xen/xen-hvm-common.h b/include/hw/xen/xen-hvm-commo= n.h index 19df5600a39..e1beca062ff 100644 --- a/include/hw/xen/xen-hvm-common.h +++ b/include/hw/xen/xen-hvm-common.h @@ -5,6 +5,7 @@ #include "exec/hwaddr.h" #include "hw/xen/xen_native.h" #include "hw/xen/xen_backend_ops.h" +#include "system/runstate.h" #include =20 extern MemoryRegion xen_memory; diff --git a/include/system/balloon.h b/include/system/balloon.h index 867687b73ac..066c7e1ddf4 100644 --- a/include/system/balloon.h +++ b/include/system/balloon.h @@ -14,7 +14,7 @@ #ifndef QEMU_BALLOON_H #define QEMU_BALLOON_H =20 -#include "exec/cpu-common.h" +#include "system/ram_addr.h" #include "qapi/qapi-types-machine.h" =20 typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target); diff --git a/include/system/block-ram-registrar.h b/include/system/block-ra= m-registrar.h index d8b2f7942ba..61b0dff3400 100644 --- a/include/system/block-ram-registrar.h +++ b/include/system/block-ram-registrar.h @@ -7,7 +7,7 @@ #ifndef BLOCK_RAM_REGISTRAR_H #define BLOCK_RAM_REGISTRAR_H =20 -#include "exec/ramlist.h" +#include "system/ramlist.h" =20 /** * struct BlockRAMRegistrar: diff --git a/include/system/iommufd.h b/include/system/iommufd.h index a659f36a20f..9f5eb872454 100644 --- a/include/system/iommufd.h +++ b/include/system/iommufd.h @@ -16,7 +16,7 @@ =20 #include "qom/object.h" #include "exec/hwaddr.h" -#include "exec/cpu-common.h" +#include "system/ram_addr.h" #include "system/host_iommu_device.h" =20 #define TYPE_IOMMUFD_BACKEND "iommufd" diff --git a/include/system/memory.h b/include/system/memory.h index 1cacc117cc6..b3597fb2d04 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -14,11 +14,10 @@ #ifndef SYSTEM_MEMORY_H #define SYSTEM_MEMORY_H =20 -#include "exec/cpu-common.h" #include "exec/hwaddr.h" +#include "system/ram_addr.h" #include "exec/memattrs.h" #include "exec/memop.h" -#include "exec/ramlist.h" #include "qemu/bswap.h" #include "qemu/queue.h" #include "qemu/int128.h" @@ -27,6 +26,12 @@ #include "qom/object.h" #include "qemu/rcu.h" =20 +enum device_endian { + DEVICE_NATIVE_ENDIAN, + DEVICE_BIG_ENDIAN, + DEVICE_LITTLE_ENDIAN, +}; + #define RAM_ADDR_INVALID (~(ram_addr_t)0) =20 #define MAX_PHYS_ADDR_SPACE_BITS 62 @@ -3266,6 +3271,13 @@ address_space_write_cached(MemoryRegionCache *cache,= hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); =20 +/* Coalesced MMIO regions are areas where write operations can be reordere= d. + * This usually implies that write operations are side-effect free. This = allows + * batching which can make a major impact on performance when using + * virtualization. + */ +void qemu_flush_coalesced_mmio_buffer(void); + /* * Inhibit technologies that require discarding of pages in RAM blocks, e.= g., * to manage the actual amount of memory consumed by the VM (then, the mem= ory diff --git a/include/system/memory_mapping.h b/include/system/memory_mappin= g.h index 021e0a62309..4c770bf0b83 100644 --- a/include/system/memory_mapping.h +++ b/include/system/memory_mapping.h @@ -15,7 +15,9 @@ #define MEMORY_MAPPING_H =20 #include "qemu/queue.h" -#include "exec/cpu-common.h" +#include "exec/hwaddr.h" +#include "exec/vaddr.h" +#include "system/ram_addr.h" =20 typedef struct GuestPhysBlock { /* visible to guest, reflects PCI hole, etc */ diff --git a/include/system/physmem.h b/include/system/physmem.h index 879f6eae38b..ed337130228 100644 --- a/include/system/physmem.h +++ b/include/system/physmem.h @@ -9,7 +9,7 @@ #define QEMU_SYSTEM_PHYSMEM_H =20 #include "exec/hwaddr.h" -#include "exec/ramlist.h" +#include "system/ramlist.h" =20 #define DIRTY_CLIENTS_ALL ((1 << DIRTY_MEMORY_NUM) - 1) #define DIRTY_CLIENTS_NOCODE (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_COD= E)) diff --git a/include/system/ram_addr.h b/include/system/ram_addr.h index 683485980ce..129f6b8757d 100644 --- a/include/system/ram_addr.h +++ b/include/system/ram_addr.h @@ -1,5 +1,5 @@ /* - * Declarations for cpu physical memory functions + * Declarations of basic RAMBlock-related types and macros * * Copyright 2011 Red Hat, Inc. and/or its affiliates * @@ -11,125 +11,23 @@ * */ =20 -/* - * This header is for use by exec.c and memory.c ONLY. Do not include it. - * The functions declared here will be removed soon. - */ +#ifndef RAM_ADDR_H +#define RAM_ADDR_H =20 -#ifndef SYSTEM_RAM_ADDR_H -#define SYSTEM_RAM_ADDR_H +/* address in the RAM (different from a physical address) */ +#if defined(CONFIG_XEN_BACKEND) +typedef uint64_t ram_addr_t; +# define RAM_ADDR_MAX UINT64_MAX +# define RAM_ADDR_FMT "%" PRIx64 +#else +typedef uintptr_t ram_addr_t; +# define RAM_ADDR_MAX UINTPTR_MAX +# define RAM_ADDR_FMT "%" PRIxPTR +#endif =20 -#include "system/ramblock.h" -#include "exec/target_page.h" -#include "exec/hwaddr.h" - -extern uint64_t total_dirty_pages; - -/** - * clear_bmap_size: calculate clear bitmap size - * - * @pages: number of guest pages - * @shift: guest page number shift - * - * Returns: number of bits for the clear bitmap - */ -static inline long clear_bmap_size(uint64_t pages, uint8_t shift) -{ - return DIV_ROUND_UP(pages, 1UL << shift); -} - -/** - * clear_bmap_set: set clear bitmap for the page range. Must be with - * bitmap_mutex held. - * - * @rb: the ramblock to operate on - * @start: the start page number - * @size: number of pages to set in the bitmap - * - * Returns: None - */ -static inline void clear_bmap_set(RAMBlock *rb, uint64_t start, - uint64_t npages) -{ - uint8_t shift =3D rb->clear_bmap_shift; - - bitmap_set(rb->clear_bmap, start >> shift, clear_bmap_size(npages, shi= ft)); -} - -/** - * clear_bmap_test_and_clear: test clear bitmap for the page, clear if set. - * Must be with bitmap_mutex held. - * - * @rb: the ramblock to operate on - * @page: the page number to check - * - * Returns: true if the bit was set, false otherwise - */ -static inline bool clear_bmap_test_and_clear(RAMBlock *rb, uint64_t page) -{ - uint8_t shift =3D rb->clear_bmap_shift; - - return bitmap_test_and_clear(rb->clear_bmap, page >> shift, 1); -} - -static inline unsigned long int ramblock_recv_bitmap_offset(void *host_add= r, - RAMBlock *rb) -{ - uint64_t host_addr_offset =3D - (uint64_t)(uintptr_t)(host_addr - (void *)rb->host); - return host_addr_offset >> TARGET_PAGE_BITS; -} - -/** - * qemu_ram_alloc_from_file, - * qemu_ram_alloc_from_fd: Allocate a ram block from the specified backing - * file or device - * - * Parameters: - * @size: the size in bytes of the ram block - * @max_size: the maximum size of the block after resizing - * @mr: the memory region where the ram block is - * @resized: callback after calls to qemu_ram_resize - * @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM, - * RAM_NORESERVE, RAM_PROTECTED, RAM_NAMED_FILE, RAM_READONLY, - * RAM_READONLY_FD, RAM_GUEST_MEMFD - * @mem_path or @fd: specify the backing file or device - * @offset: Offset into target file - * @grow: extend file if necessary (but an empty file is always extended). - * @errp: pointer to Error*, to store an error if it happens - * - * Return: - * On success, return a pointer to the ram block. - * On failure, return NULL. - */ -typedef void (*qemu_ram_resize_cb)(const char *, uint64_t length, void *ho= st); - -RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, - uint32_t ram_flags, const char *mem_pat= h, - off_t offset, Error **errp); -RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, ram_addr_t max_size, - qemu_ram_resize_cb resized, MemoryRegion = *mr, - uint32_t ram_flags, int fd, off_t offset, - bool grow, - Error **errp); - -RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, - MemoryRegion *mr, Error **errp); -RAMBlock *qemu_ram_alloc(ram_addr_t size, uint32_t ram_flags, MemoryRegion= *mr, - Error **errp); -RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t max_size, - qemu_ram_resize_cb resized, - MemoryRegion *mr, Error **errp); -void qemu_ram_free(RAMBlock *block); - -int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp); - -void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length); - -/* Clear whole block of mem */ -static inline void qemu_ram_block_writeback(RAMBlock *block) -{ - qemu_ram_msync(block, 0, block->used_length); -} +#define DIRTY_MEMORY_VGA 0 +#define DIRTY_MEMORY_CODE 1 +#define DIRTY_MEMORY_MIGRATION 2 +#define DIRTY_MEMORY_NUM 3 /* num of dirty bits */ =20 #endif diff --git a/include/system/ramblock.h b/include/system/ramblock.h index 76694fe1b5b..e9f58ac0457 100644 --- a/include/system/ramblock.h +++ b/include/system/ramblock.h @@ -14,9 +14,9 @@ #ifndef SYSTEM_RAMBLOCK_H #define SYSTEM_RAMBLOCK_H =20 -#include "exec/cpu-common.h" #include "qemu/rcu.h" -#include "exec/ramlist.h" +#include "system/ram_addr.h" +#include "system/ramlist.h" #include "system/hostmem.h" =20 #define TYPE_RAM_BLOCK_ATTRIBUTES "ram-block-attributes" @@ -130,4 +130,160 @@ static inline void *ramblock_ptr(RAMBlock *block, ram= _addr_t offset) return (char *)block->host + offset; } =20 +/* memory API */ + +void qemu_ram_remap(ram_addr_t addr); +/* This should not be used by devices. */ +ram_addr_t qemu_ram_addr_from_host(void *ptr); +ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr); +RAMBlock *qemu_ram_block_by_name(const char *name); + +/* + * Translates a host ptr back to a RAMBlock and an offset in that RAMBlock. + * + * @ptr: The host pointer to translate. + * @round_offset: Whether to round the result offset down to a target page + * @offset: Will be set to the offset within the returned RAMBlock. + * + * Returns: RAMBlock (or NULL if not found) + * + * By the time this function returns, the returned pointer is not protected + * by RCU anymore. If the caller is not within an RCU critical section and + * does not hold the BQL, it must have other means of protecting the + * pointer, such as a reference to the memory region that owns the RAMBloc= k. + */ +RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset, + ram_addr_t *offset); +ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host); +void qemu_ram_set_idstr(RAMBlock *block, const char *name, DeviceState *de= v); +void qemu_ram_unset_idstr(RAMBlock *block); +const char *qemu_ram_get_idstr(RAMBlock *rb); +void *qemu_ram_get_host_addr(RAMBlock *rb); +ram_addr_t qemu_ram_get_offset(RAMBlock *rb); +ram_addr_t qemu_ram_get_fd_offset(RAMBlock *rb); +ram_addr_t qemu_ram_get_used_length(RAMBlock *rb); +ram_addr_t qemu_ram_get_max_length(RAMBlock *rb); +bool qemu_ram_is_shared(RAMBlock *rb); +bool qemu_ram_is_noreserve(RAMBlock *rb); +bool qemu_ram_is_uf_zeroable(RAMBlock *rb); +void qemu_ram_set_uf_zeroable(RAMBlock *rb); +bool qemu_ram_is_migratable(RAMBlock *rb); +void qemu_ram_set_migratable(RAMBlock *rb); +void qemu_ram_unset_migratable(RAMBlock *rb); +bool qemu_ram_is_named_file(RAMBlock *rb); +int qemu_ram_get_fd(RAMBlock *rb); + +size_t qemu_ram_pagesize(RAMBlock *block); +size_t qemu_ram_pagesize_largest(void); +#include "exec/target_page.h" +#include "exec/hwaddr.h" + +extern uint64_t total_dirty_pages; + +/** + * clear_bmap_size: calculate clear bitmap size + * + * @pages: number of guest pages + * @shift: guest page number shift + * + * Returns: number of bits for the clear bitmap + */ +static inline long clear_bmap_size(uint64_t pages, uint8_t shift) +{ + return DIV_ROUND_UP(pages, 1UL << shift); +} + +/** + * clear_bmap_set: set clear bitmap for the page range. Must be with + * bitmap_mutex held. + * + * @rb: the ramblock to operate on + * @start: the start page number + * @size: number of pages to set in the bitmap + * + * Returns: None + */ +static inline void clear_bmap_set(RAMBlock *rb, uint64_t start, + uint64_t npages) +{ + uint8_t shift =3D rb->clear_bmap_shift; + + bitmap_set(rb->clear_bmap, start >> shift, clear_bmap_size(npages, shi= ft)); +} + +/** + * clear_bmap_test_and_clear: test clear bitmap for the page, clear if set. + * Must be with bitmap_mutex held. + * + * @rb: the ramblock to operate on + * @page: the page number to check + * + * Returns: true if the bit was set, false otherwise + */ +static inline bool clear_bmap_test_and_clear(RAMBlock *rb, uint64_t page) +{ + uint8_t shift =3D rb->clear_bmap_shift; + + return bitmap_test_and_clear(rb->clear_bmap, page >> shift, 1); +} + +static inline unsigned long int ramblock_recv_bitmap_offset(void *host_add= r, + RAMBlock *rb) +{ + uint64_t host_addr_offset =3D + (uint64_t)(uintptr_t)(host_addr - (void *)rb->host); + return host_addr_offset >> TARGET_PAGE_BITS; +} + +/** + * qemu_ram_alloc_from_file, + * qemu_ram_alloc_from_fd: Allocate a ram block from the specified backing + * file or device + * + * Parameters: + * @size: the size in bytes of the ram block + * @max_size: the maximum size of the block after resizing + * @mr: the memory region where the ram block is + * @resized: callback after calls to qemu_ram_resize + * @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM, + * RAM_NORESERVE, RAM_PROTECTED, RAM_NAMED_FILE, RAM_READONLY, + * RAM_READONLY_FD, RAM_GUEST_MEMFD + * @mem_path or @fd: specify the backing file or device + * @offset: Offset into target file + * @grow: extend file if necessary (but an empty file is always extended). + * @errp: pointer to Error*, to store an error if it happens + * + * Return: + * On success, return a pointer to the ram block. + * On failure, return NULL. + */ +typedef void (*qemu_ram_resize_cb)(const char *, uint64_t length, void *ho= st); + +RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, + uint32_t ram_flags, const char *mem_pat= h, + off_t offset, Error **errp); +RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, ram_addr_t max_size, + qemu_ram_resize_cb resized, MemoryRegion = *mr, + uint32_t ram_flags, int fd, off_t offset, + bool grow, + Error **errp); + +RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, + MemoryRegion *mr, Error **errp); +RAMBlock *qemu_ram_alloc(ram_addr_t size, uint32_t ram_flags, MemoryRegion= *mr, + Error **errp); +RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t max_size, + qemu_ram_resize_cb resized, + MemoryRegion *mr, Error **errp); +void qemu_ram_free(RAMBlock *block); + +int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp); + +void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length); + +/* Clear whole block of mem */ +static inline void qemu_ram_block_writeback(RAMBlock *block) +{ + qemu_ram_msync(block, 0, block->used_length); +} #endif diff --git a/include/exec/ramlist.h b/include/system/ramlist.h similarity index 94% rename from include/exec/ramlist.h rename to include/system/ramlist.h index d9cfe530bea..c7f388f487d 100644 --- a/include/exec/ramlist.h +++ b/include/system/ramlist.h @@ -5,14 +5,10 @@ #include "qemu/thread.h" #include "qemu/rcu.h" #include "qemu/rcu_queue.h" +#include "system/ram_addr.h" =20 typedef struct RAMBlockNotifier RAMBlockNotifier; =20 -#define DIRTY_MEMORY_VGA 0 -#define DIRTY_MEMORY_CODE 1 -#define DIRTY_MEMORY_MIGRATION 2 -#define DIRTY_MEMORY_NUM 3 /* num of dirty bits */ - /* The dirty memory bitmap is split into fixed-size blocks to allow growth * under RCU. The bitmap for a block can be accessed as follows: * @@ -75,6 +71,10 @@ struct RAMBlockNotifier { QLIST_ENTRY(RAMBlockNotifier) next; }; =20 +typedef int (RAMBlockIterFunc)(RAMBlock *rb, void *opaque); + +int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque); + void ram_block_notifier_add(RAMBlockNotifier *n); void ram_block_notifier_remove(RAMBlockNotifier *n); void ram_block_notify_add(void *host, size_t size, size_t max_size); diff --git a/include/system/xen-mapcache.h b/include/system/xen-mapcache.h index bb454a7c96c..fa2cff38d1a 100644 --- a/include/system/xen-mapcache.h +++ b/include/system/xen-mapcache.h @@ -9,7 +9,6 @@ #ifndef XEN_MAPCACHE_H #define XEN_MAPCACHE_H =20 -#include "exec/cpu-common.h" #include "system/xen.h" =20 typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr phys_offset, diff --git a/include/system/xen.h b/include/system/xen.h index c2f283d1c26..9a7c53f2838 100644 --- a/include/system/xen.h +++ b/include/system/xen.h @@ -10,7 +10,8 @@ #ifndef SYSTEM_XEN_H #define SYSTEM_XEN_H =20 -#include "exec/cpu-common.h" +#include "exec/hwaddr.h" +#include "system/ram_addr.h" =20 #ifdef COMPILING_PER_TARGET # ifdef CONFIG_XEN diff --git a/migration/migration.h b/migration/migration.h index fbe02d5bb1a..43fbe5488ca 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -14,7 +14,8 @@ #ifndef QEMU_MIGRATION_H #define QEMU_MIGRATION_H =20 -#include "exec/cpu-common.h" +#include "system/ram_addr.h" +#include "system/ramblock.h" #include "hw/core/qdev.h" #include "qapi/qapi-types-migration.h" #include "qobject/json-writer.h" diff --git a/accel/mshv/mshv-all.c b/accel/mshv/mshv-all.c index 47c67ef8cc9..4675cb886fe 100644 --- a/accel/mshv/mshv-all.c +++ b/accel/mshv/mshv-all.c @@ -31,6 +31,7 @@ #include "qemu/guest-random.h" #include "accel/accel-ops.h" #include "accel/accel-cpu-ops.h" +#include "exec/cpu-common.h" #include "system/cpus.h" #include "system/runstate.h" #include "system/accel-blocker.h" diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index fd1606c8565..655d1e113f9 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -30,7 +30,7 @@ #include "accel/tcg/cpu-mmu-index.h" #include "exec/cputlb.h" #include "exec/tb-flush.h" -#include "system/ram_addr.h" +#include "system/ramblock.h" #include "exec/mmu-access-type.h" #include "exec/tlb-common.h" #include "exec/vaddr.h" diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/tcg-accel-ops-mttc= g.c index 89299829c3a..4160e2ba947 100644 --- a/accel/tcg/tcg-accel-ops-mttcg.c +++ b/accel/tcg/tcg-accel-ops-mttcg.c @@ -24,6 +24,7 @@ */ =20 #include "qemu/osdep.h" +#include "exec/cpu-common.h" #include "system/tcg.h" #include "system/replay.h" #include "exec/icount.h" diff --git a/backends/hostmem.c b/backends/hostmem.c index 67827c42b87..15d4365b697 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -12,6 +12,7 @@ =20 #include "qemu/osdep.h" #include "system/hostmem.h" +#include "system/ramblock.h" #include "hw/core/boards.h" #include "qapi/error.h" #include "qapi/qapi-builtin-visit.h" diff --git a/block/blkio.c b/block/blkio.c index 41426739847..20f138a38c5 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -12,7 +12,7 @@ #include #include "block/block_int.h" #include "system/memory.h" -#include "exec/cpu-common.h" /* for qemu_ram_get_fd() */ +#include "system/ramblock.h" #include "qemu/defer-call.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/dump/dump.c b/dump/dump.c index 15bbcc0c619..f7a99a7af2e 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -15,6 +15,7 @@ #include "qemu/cutils.h" #include "elf.h" #include "qemu/bswap.h" +#include "exec/cpu-common.h" #include "exec/target_page.h" #include "monitor/monitor.h" #include "system/dump.h" diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index 06555905ceb..365156dff90 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -27,6 +27,7 @@ #include "hw/acpi/generic_event_device.h" #include "hw/nvram/fw_cfg.h" #include "qemu/uuid.h" +#include "exec/cpu-common.h" =20 #define ACPI_HW_ERROR_FW_CFG_FILE "etc/hardware_errors" #define ACPI_HW_ERROR_ADDR_FW_CFG_FILE "etc/hardware_errors_addr" diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 732d613ac09..eb4b4770765 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -36,6 +36,7 @@ #include "hw/mem/nvdimm.h" #include "qemu/nvdimm-utils.h" #include "trace.h" +#include "exec/cpu-common.h" =20 /* * define Byte Addressable Persistent Memory (PM) Region according to diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index e87c0256964..70ad029057b 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -21,6 +21,7 @@ #include "hw/core/qdev-properties-system.h" #include "migration/vmstate.h" #include "system/reset.h" +#include "exec/cpu-common.h" =20 void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *gui= d, BIOSLinker *linker, const char *oem_id) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index f5ff4b107ae..9ca8eecfa09 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -24,6 +24,7 @@ #include "qapi/error.h" #include "cpu.h" #include "system/address-spaces.h" +#include "exec/cpu-common.h" #include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index 6d5e99123d6..4ad4a220a98 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -12,6 +12,7 @@ =20 #include "qemu/osdep.h" #include "hw/core/sysbus.h" +#include "exec/cpu-common.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" diff --git a/hw/char/riscv_htif.c b/hw/char/riscv_htif.c index a78ea9b01c0..e9efab16e99 100644 --- a/hw/char/riscv_htif.c +++ b/hw/char/riscv_htif.c @@ -31,6 +31,7 @@ #include "system/address-spaces.h" #include "system/dma.h" #include "system/runstate.h" +#include "exec/cpu-common.h" #include "trace.h" =20 #define HTIF_DEV_SHIFT 56 diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index 2e925880afa..6d54c12a778 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -19,6 +19,7 @@ */ =20 #include "qemu/osdep.h" +#include "exec/cpu-common.h" #include "qapi/error.h" #include "hw/core/cpu.h" #include "system/hw_accel.h" diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index d23466177d8..79cbcdd63e8 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -26,6 +26,7 @@ #include "system/hostmem.h" #include "system/hw_accel.h" #include "system/numa.h" +#include "system/ramlist.h" #include "system/runstate.h" #include "system/system.h" #include "hw/s390x/storage-keys.h" diff --git a/hw/core/numa.c b/hw/core/numa.c index fa78dacb6be..f462883c87c 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -27,7 +27,8 @@ #include "system/hostmem.h" #include "system/numa.h" #include "exec/cpu-common.h" -#include "exec/ramlist.h" +#include "system/ramlist.h" +#include "system/ramblock.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/opts-visitor.h" diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index a97054132fb..2d8fa7ee944 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -27,6 +27,7 @@ #include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/sysbus.h" +#include "exec/cpu-common.h" #include "migration/vmstate.h" #include "ui/console.h" #include "ui/pixel_ops.h" diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c index 90a97314541..c41c65bb2e0 100644 --- a/hw/display/omap_lcdc.c +++ b/hw/display/omap_lcdc.c @@ -23,6 +23,7 @@ #include "hw/arm/omap.h" #include "framebuffer.h" #include "ui/pixel_ops.h" +#include "exec/cpu-common.h" =20 struct omap_lcd_panel_s { MemoryRegion *sysmem; diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index ad12fb1782e..50c25706a52 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -18,6 +18,7 @@ #include "hw/display/bochs-vbe.h" /* for limits */ #include "ui/console.h" #include "system/reset.h" +#include "exec/cpu-common.h" =20 struct QEMU_PACKED RAMFBCfg { uint64_t addr; diff --git a/hw/display/vga.c b/hw/display/vga.c index 90b89cf4044..59a65cbbff5 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "system/reset.h" +#include "system/ramblock.h" #include "qapi/error.h" #include "qemu/target-info.h" #include "hw/display/vga.h" diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index d909d6c8fc2..3637d8f82d7 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -27,6 +27,7 @@ #include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/dma/i8257.h" +#include "exec/cpu-common.h" #include "qapi/error.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index 2bf9ebad565..963ce6fd102 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -23,6 +23,7 @@ #include "hw/arm/omap.h" #include "hw/core/irq.h" #include "hw/arm/soc_dma.h" +#include "exec/cpu-common.h" =20 struct omap_dma_channel_s { /* transfer data */ diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index 93db286e690..159d0173913 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -27,6 +27,7 @@ #include "hw/core/irq.h" #include "hw/mips/mips.h" #include "hw/core/sysbus.h" +#include "exec/cpu-common.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/dma/sifive_pdma.c b/hw/dma/sifive_pdma.c index 2844515b2d7..6d06ec0375f 100644 --- a/hw/dma/sifive_pdma.c +++ b/hw/dma/sifive_pdma.c @@ -27,6 +27,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/sysbus.h" +#include "exec/cpu-common.h" #include "migration/vmstate.h" #include "system/dma.h" #include "hw/dma/sifive_pdma.h" diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c index e4d0688dbfa..27e323a8196 100644 --- a/hw/hyperv/hyperv.c +++ b/hw/hyperv/hyperv.c @@ -14,6 +14,7 @@ #include "system/address-spaces.h" #include "system/memory.h" #include "exec/target_page.h" +#include "exec/cpu-common.h" #include "linux/kvm.h" #include "system/kvm.h" #include "qemu/bitops.h" diff --git a/hw/hyperv/syndbg.c b/hw/hyperv/syndbg.c index dc6cc84b503..1e177f9dd82 100644 --- a/hw/hyperv/syndbg.c +++ b/hw/hyperv/syndbg.c @@ -19,6 +19,7 @@ #include "hw/hyperv/hyperv.h" #include "hw/hyperv/vmbus-bridge.h" #include "hw/hyperv/hyperv-proto.h" +#include "exec/cpu-common.h" #include "net/net.h" #include "net/eth.h" #include "net/checksum.h" diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index c01f3392360..c5bab5d2452 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -19,6 +19,7 @@ #include "hw/hyperv/vmbus.h" #include "hw/hyperv/vmbus-bridge.h" #include "hw/core/sysbus.h" +#include "exec/cpu-common.h" #include "exec/target_page.h" #include "trace.h" =20 diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index 8ca88afae24..aba6842a22c 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -24,6 +24,7 @@ #include "hw/core/sysbus.h" #include "hw/i386/kvm/clock.h" #include "hw/core/qdev-properties.h" +#include "exec/cpu-common.h" #include "qapi/error.h" =20 #include diff --git a/hw/i386/vapic.c b/hw/i386/vapic.c index 32f92a28b88..670a50524d6 100644 --- a/hw/i386/vapic.c +++ b/hw/i386/vapic.c @@ -21,6 +21,7 @@ #include "hw/i386/apic_internal.h" #include "hw/core/sysbus.h" #include "hw/core/boards.h" +#include "exec/cpu-common.h" #include "migration/vmstate.h" #include "qom/object.h" =20 diff --git a/hw/intc/apic.c b/hw/intc/apic.c index aad253af158..dd8c77f8180 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -30,6 +30,7 @@ #include "system/mshv.h" #include "trace.h" #include "hw/i386/apic-msidef.h" +#include "exec/cpu-common.h" #include "qapi/error.h" #include "qom/object.h" =20 diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c index 495925196a8..d353391208e 100644 --- a/hw/intc/xive2.c +++ b/hw/intc/xive2.c @@ -17,6 +17,7 @@ #include "hw/ppc/xive.h" #include "hw/ppc/xive2.h" #include "hw/ppc/xive2_regs.h" +#include "exec/cpu-common.h" #include "trace.h" =20 static void xive2_router_end_notify(Xive2Router *xrtr, uint8_t end_blk, diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index ca3df7b887b..26177c7b867 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -12,6 +12,7 @@ =20 #include "qemu/osdep.h" #include "exec/hwaddr.h" +#include "exec/cpu-common.h" #include "exec/cpu-interrupt.h" #include "system/system.h" #include "system/qtest.h" diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 8ff99b3339d..a6f9ebab90c 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -33,6 +33,7 @@ #include "qemu/guest-random.h" #include "system/device_tree.h" #include "system/reset.h" +#include "exec/cpu-common.h" #include "hw/core/boards.h" #include "hw/core/loader.h" #include "elf.h" diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c index 4093cb3c99c..228012e772f 100644 --- a/hw/misc/pc-testdev.c +++ b/hw/misc/pc-testdev.c @@ -39,6 +39,7 @@ #include "qemu/module.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" +#include "exec/cpu-common.h" #include "qom/object.h" =20 #define IOMEM_LEN 0x10000 diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c index 42216de6c9a..22660c32b84 100644 --- a/hw/net/fsl_etsec/rings.c +++ b/hw/net/fsl_etsec/rings.c @@ -26,6 +26,7 @@ #include "qemu/log.h" #include "etsec.h" #include "registers.h" +#include "exec/cpu-common.h" =20 /* #define ETSEC_RING_DEBUG */ /* #define HEX_DUMP */ diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index 5f267e5ea38..79a5c4385c6 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -16,6 +16,7 @@ #include "hw/net/mii.h" #include "hw/core/qdev-properties.h" #include "hw/core/sysbus.h" +#include "exec/cpu-common.h" #include /* for crc32 */ =20 //#define DEBUG_FEC 1 diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index ec3301414cc..6abeffcc9c7 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -36,6 +36,7 @@ #include "hw/net/mii.h" #include "hw/core/qdev-properties.h" #include "hw/core/sysbus.h" +#include "exec/cpu-common.h" #include "net/net.h" #include "qemu/module.h" #include "net/eth.h" diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index 8d316e94c17..204c78aba37 100644 --- a/hw/net/xgmac.c +++ b/hw/net/xgmac.c @@ -28,6 +28,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/sysbus.h" +#include "exec/cpu-common.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "net/net.h" diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c index 58d81f77c88..3af7e6ecbec 100644 --- a/hw/nvram/spapr_nvram.c +++ b/hw/nvram/spapr_nvram.c @@ -38,6 +38,7 @@ #include "hw/ppc/spapr_vio.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" +#include "exec/cpu-common.h" #include "qom/object.h" =20 struct SpaprNvram { diff --git a/hw/ppc/amigaone.c b/hw/ppc/amigaone.c index 4b858443806..8074713fbe9 100644 --- a/hw/ppc/amigaone.c +++ b/hw/ppc/amigaone.c @@ -21,6 +21,7 @@ #include "hw/ide/pci.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/ppc/ppc.h" +#include "exec/cpu-common.h" #include "system/block-backend.h" #include "system/qtest.h" #include "system/reset.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 113a2daca1d..eb0d3a418e2 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -52,6 +52,7 @@ #include "hw/core/irq.h" #include "hw/sd/sdhci.h" #include "hw/misc/unimp.h" +#include "exec/cpu-common.h" =20 #define EPAPR_MAGIC (0x45504150) #define DTC_LOAD_PAD 0x1800000 diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c index 3e4d19fbe84..ac9fc5a6542 100644 --- a/hw/ppc/pegasos.c +++ b/hw/ppc/pegasos.c @@ -39,6 +39,7 @@ #include "qemu/datadir.h" #include "system/device_tree.h" #include "hw/ppc/vof.h" +#include "exec/cpu-common.h" =20 #include =20 diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index f891c3a797c..1513575b8f3 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -58,6 +58,7 @@ #include "hw/isa/isa.h" #include "hw/char/serial-isa.h" #include "hw/rtc/mc146818rtc.h" +#include "exec/cpu-common.h" =20 #include =20 diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index fc6dd332e88..0f28a7937fb 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -17,6 +17,7 @@ #include "hw/pci-host/ppc4xx.h" #include "hw/core/qdev-properties.h" #include "hw/pci/pci.h" +#include "exec/cpu-common.h" #include "system/reset.h" #include "cpu.h" #include "ppc440.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index eb626547ebd..bcf6aa560f3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -43,6 +43,7 @@ #include "system/reset.h" #include "system/runstate.h" #include "qemu/log.h" +#include "exec/cpu-common.h" #include "hw/core/fw-path-provider.h" #include "elf.h" #include "net/net.h" diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index d2044b4fb52..9bc65c760ea 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -23,6 +23,7 @@ #include "hw/ppc/spapr.h" /* for RTAS return codes */ #include "hw/pci-host/spapr.h" /* spapr_phb_remove_pci_device_cb callback = */ #include "hw/ppc/spapr_nvdimm.h" +#include "exec/cpu-common.h" #include "system/device_tree.h" #include "system/reset.h" #include "trace.h" diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index b1774e88f2b..1a21ac7bbf8 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -41,6 +41,7 @@ #include "qemu/bcd.h" #include "qemu/main-loop.h" #include "hw/ppc/spapr_ovec.h" +#include "exec/cpu-common.h" #include #include "migration/blocker.h" =20 diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 8f03b3e7764..032805a8d0d 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -24,6 +24,7 @@ #include "hw/ppc/spapr_numa.h" #include "mmu-book3s-v3.h" #include "hw/mem/memory-device.h" +#include "exec/cpu-common.h" =20 bool is_ram_address(SpaprMachineState *spapr, hwaddr addr) { diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index a6715b4026d..cb79ad34053 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -46,6 +46,7 @@ #include "qemu/cutils.h" #include "trace.h" #include "hw/ppc/fdt.h" +#include "exec/cpu-common.h" #include "target/ppc/mmu-hash64.h" #include "target/ppc/mmu-book3s-v3.h" #include "migration/blocker.h" diff --git a/hw/ppc/spapr_tpm_proxy.c b/hw/ppc/spapr_tpm_proxy.c index a48dab7e7a6..361a3dc817d 100644 --- a/hw/ppc/spapr_tpm_proxy.c +++ b/hw/ppc/spapr_tpm_proxy.c @@ -16,6 +16,7 @@ #include "system/reset.h" #include "hw/ppc/spapr.h" #include "hw/core/qdev-properties.h" +#include "exec/cpu-common.h" #include "trace.h" =20 #define TPM_SPAPR_BUFSIZE 4096 diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 8b3e67b627c..51b3d7d7121 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -44,6 +44,7 @@ #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "hw/core/qdev-properties.h" +#include "exec/cpu-common.h" =20 #include =20 diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-lis= tener.c index e1a52d24f0b..d0c856b0939 100644 --- a/hw/remote/proxy-memory-listener.c +++ b/hw/remote/proxy-memory-listener.c @@ -11,6 +11,7 @@ #include "qemu/int128.h" #include "qemu/range.h" #include "system/memory.h" +#include "system/ramblock.h" #include "exec/cpu-common.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/s390x/css.c b/hw/s390x/css.c index d2c0af6a9bf..ccc9c1c243b 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -22,6 +22,7 @@ #include "hw/s390x/s390_flic.h" #include "hw/s390x/s390-virtio-ccw.h" #include "hw/s390x/s390-ccw.h" +#include "exec/cpu-common.h" =20 typedef struct CrwContainer { CRW crw; diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index b119a87a864..d34adb55220 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -28,6 +28,7 @@ #include "hw/s390x/ebcdic.h" #include "hw/scsi/scsi.h" #include "hw/virtio/virtio-net.h" +#include "exec/cpu-common.h" #include "ipl.h" #include "qemu/error-report.h" #include "qemu/config-file.h" diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index ff415b6312d..30fdca1e8a6 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -25,6 +25,7 @@ #include "hw/core/qdev-properties.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/msi.h" +#include "exec/cpu-common.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "system/reset.h" diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 4a3ffb84f8f..b4011c4049d 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -32,6 +32,7 @@ #include "trace.h" #include "hw/s390x/css-bridge.h" #include "hw/s390x/s390-virtio-ccw.h" +#include "exec/cpu-common.h" #include "system/replay.h" =20 #define NR_CLASSIC_INDICATOR_BITS 64 diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index b3cdc255b46..11ae6b9b747 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -34,6 +34,7 @@ #include "scsi/constants.h" #include "hw/pci/msi.h" #include "hw/core/qdev-properties.h" +#include "exec/cpu-common.h" #include "vmw_pvscsi.h" #include "trace.h" #include "qom/object.h" diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index ec9a386b48d..d4e25f761a6 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -29,6 +29,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "qemu/datadir.h" +#include "exec/cpu-common.h" #include "cpu.h" #include "hw/core/irq.h" #include "qemu/timer.h" diff --git a/hw/vfio-user/container.c b/hw/vfio-user/container.c index dab7a23224c..d5275a463b8 100644 --- a/hw/vfio-user/container.c +++ b/hw/vfio-user/container.c @@ -15,6 +15,7 @@ #include "hw/vfio-user/trace.h" #include "hw/vfio/vfio-device.h" #include "hw/vfio/vfio-listener.h" +#include "system/ramblock.h" #include "qapi/error.h" =20 /* diff --git a/hw/vfio/container.c b/hw/vfio/container.c index 013a691bc5a..5993d905457 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -15,7 +15,7 @@ #include =20 #include "system/tcg.h" -#include "system/ram_addr.h" +#include "system/ramblock.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/vfio/vfio-container.h" diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c index 2cbc7b4964f..c595f860cea 100644 --- a/hw/vfio/helpers.c +++ b/hw/vfio/helpers.c @@ -23,6 +23,7 @@ #include =20 #include "system/kvm.h" +#include "exec/cpu-common.h" #include "hw/vfio/vfio-device.h" #include "hw/core/hw-error.h" #include "qapi/error.h" diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index fde343f06e3..58a4940b00e 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -27,7 +27,7 @@ #include "migration-multifd.h" #include "qapi/error.h" #include "qapi/qapi-events-vfio.h" -#include "exec/ramlist.h" +#include "system/ramlist.h" #include "pci.h" #include "trace.h" #include "hw/core/hw-error.h" diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 266a11514a1..2e33e78e775 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -28,6 +28,7 @@ #include "migration/qemu-file-types.h" #include "system/dma.h" #include "system/memory.h" +#include "system/ramblock.h" #include "trace.h" =20 /* enabled until disconnected backend stabilizes */ diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c index e31d3797025..11115f60845 100644 --- a/hw/xen/xen-mapcache.c +++ b/hw/xen/xen-mapcache.c @@ -18,6 +18,7 @@ #include "hw/xen/xen_native.h" #include "qemu/bitmap.h" =20 +#include "system/ramlist.h" #include "system/runstate.h" #include "system/xen-mapcache.h" #include "trace.h" diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c index 2c0cec97234..445f33e1726 100644 --- a/hw/xen/xen_pt_graphics.c +++ b/hw/xen/xen_pt_graphics.c @@ -5,6 +5,7 @@ #include "qapi/error.h" #include "hw/xen/xen_pt.h" #include "hw/xen/xen_igd.h" +#include "exec/cpu-common.h" #include "xen-host-pci-device.h" =20 static unsigned long igd_guest_opregion; diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 5e6f897429d..d427d68e505 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -49,6 +49,7 @@ #include "bootparam.h" #include "xtensa_memory.h" #include "hw/xtensa/mx_pic.h" +#include "exec/cpu-common.h" #include "migration/vmstate.h" =20 typedef struct XtfpgaFlashDesc { diff --git a/migration/ram.c b/migration/ram.c index 6b469238ad2..a57f4f49b34 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -48,7 +48,7 @@ #include "qapi/qapi-commands-migration.h" #include "qapi/qmp/qerror.h" #include "trace.h" -#include "system/ram_addr.h" +#include "system/ramblock.h" #include "exec/target_page.h" #include "qemu/rcu_queue.h" #include "migration/colo.h" diff --git a/stubs/physmem.c b/stubs/physmem.c index 1fc5f2df29f..14667f2bd8f 100644 --- a/stubs/physmem.c +++ b/stubs/physmem.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "exec/cpu-common.h" +#include "system/ramblock.h" =20 RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset, ram_addr_t *offset) diff --git a/stubs/ram-block.c b/stubs/ram-block.c index e88fab31a5d..8790a59593e 100644 --- a/stubs/ram-block.c +++ b/stubs/ram-block.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" -#include "exec/ramlist.h" -#include "exec/cpu-common.h" +#include "system/ramlist.h" +#include "system/ramblock.h" #include "system/memory.h" =20 void *qemu_ram_get_host_addr(RAMBlock *rb) diff --git a/system/ioport.c b/system/ioport.c index 4f96e9119fc..801e2490c36 100644 --- a/system/ioport.c +++ b/system/ioport.c @@ -29,6 +29,7 @@ #include "system/ioport.h" #include "system/memory.h" #include "system/address-spaces.h" +#include "hw/core/qdev.h" #include "trace.h" =20 struct MemoryRegionPortioList { diff --git a/system/memory.c b/system/memory.c index b65219c2e49..25950756604 100644 --- a/system/memory.c +++ b/system/memory.c @@ -26,7 +26,7 @@ #include "qom/object.h" #include "trace.h" #include "system/physmem.h" -#include "system/ram_addr.h" +#include "system/ramblock.h" #include "system/kvm.h" #include "system/runstate.h" #include "system/tcg.h" diff --git a/system/physmem.c b/system/physmem.c index e3221ce00de..2547687d137 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -68,7 +68,7 @@ #include "qemu/main-loop.h" #include "system/replay.h" =20 -#include "system/ram_addr.h" +#include "system/ramblock.h" =20 #include "qemu/pmem.h" =20 diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 12a63602b11..48f853fff80 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -22,6 +22,7 @@ #include "qapi/error.h" #include "system/system.h" #include "system/runstate.h" +#include "system/ramblock.h" #include "system/kvm.h" #include "system/kvm_int.h" #include "kvm_arm.h" diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 60c79811382..e98da47a451 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -35,6 +35,7 @@ #include "system/hw_accel.h" #include "system/kvm_int.h" #include "system/runstate.h" +#include "system/ramblock.h" #include "kvm_i386.h" #include "../confidential-guest.h" #include "sev.h" diff --git a/target/i386/sev.c b/target/i386/sev.c index fd2dada013b..fb5a3b5d778 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -41,6 +41,7 @@ #include "confidential-guest.h" #include "hw/i386/pc.h" #include "system/address-spaces.h" +#include "system/ramlist.h" #include "hw/i386/e820_memory_layout.h" #include "qemu/queue.h" #include "qemu/cutils.h" diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 2c96eca584e..3b2f1077da6 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -41,7 +41,7 @@ #include "trace.h" #include "gdbstub/enums.h" #include "exec/memattrs.h" -#include "system/ram_addr.h" +#include "system/ramblock.h" #include "system/hostmem.h" #include "qemu/cutils.h" #include "qemu/main-loop.h" diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index 916dac1f14e..fe3bf408dda 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -41,7 +41,7 @@ #include "system/runstate.h" #include "system/device_tree.h" #include "gdbstub/enums.h" -#include "system/ram_addr.h" +#include "system/ramblock.h" #include "trace.h" #include "hw/s390x/s390-pci-inst.h" #include "hw/s390x/s390-pci-bus.h" diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index fdff042ab46..44b457c442f 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -14,7 +14,7 @@ #include #include #include "qapi/error.h" -#include "exec/ramlist.h" +#include "system/ramlist.h" #include "exec/cpu-common.h" #include "system/memory.h" #include "trace.h" --=20 2.51.1