From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org,
qemu-riscv@nongnu.org, qemu-block@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Sergio Lopez" <slp@redhat.com>
Subject: [PULL 34/41] hw/i386: Rename 'hw/kvm/clock.h' -> 'hw/i386/kvm/clock.h'
Date: Thu, 31 Aug 2023 14:56:36 +0200 [thread overview]
Message-ID: <20230831125646.67855-35-philmd@linaro.org> (raw)
In-Reply-To: <20230831125646.67855-1-philmd@linaro.org>
kvmclock_create() is only implemented in hw/i386/kvm/clock.h.
Restrict the "hw/kvm/clock.h" header to i386 by moving it to
hw/i386/.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230620083228.88796-3-philmd@linaro.org>
---
{include/hw => hw/i386}/kvm/clock.h | 4 ++--
hw/i386/kvm/clock.c | 2 +-
hw/i386/microvm.c | 2 +-
hw/i386/pc_piix.c | 2 +-
hw/i386/pc_q35.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
rename {include/hw => hw/i386}/kvm/clock.h (85%)
diff --git a/include/hw/kvm/clock.h b/hw/i386/kvm/clock.h
similarity index 85%
rename from include/hw/kvm/clock.h
rename to hw/i386/kvm/clock.h
index 3efe0a871c..401c7e445b 100644
--- a/include/hw/kvm/clock.h
+++ b/hw/i386/kvm/clock.h
@@ -10,8 +10,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef HW_KVM_CLOCK_H
-#define HW_KVM_CLOCK_H
+#ifndef HW_I386_KVM_CLOCK_H
+#define HW_I386_KVM_CLOCK_H
void kvmclock_create(bool create_always);
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 0824c6d313..34348a3324 100644
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -22,7 +22,7 @@
#include "kvm/kvm_i386.h"
#include "migration/vmstate.h"
#include "hw/sysbus.h"
-#include "hw/kvm/clock.h"
+#include "hw/i386/kvm/clock.h"
#include "hw/qdev-properties.h"
#include "qapi/error.h"
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index 6b762bc18e..8deeb62774 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -32,7 +32,7 @@
#include "hw/loader.h"
#include "hw/irq.h"
-#include "hw/kvm/clock.h"
+#include "hw/i386/kvm/clock.h"
#include "hw/i386/microvm.h"
#include "hw/i386/x86.h"
#include "target/i386/cpu.h"
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 3de8e0d741..5cbad6ad84 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -46,7 +46,7 @@
#include "hw/ide/piix.h"
#include "hw/irq.h"
#include "sysemu/kvm.h"
-#include "hw/kvm/clock.h"
+#include "hw/i386/kvm/clock.h"
#include "hw/sysbus.h"
#include "hw/i2c/smbus_eeprom.h"
#include "exec/memory.h"
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index a95c5d046e..0bd68690f5 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -35,7 +35,7 @@
#include "hw/i2c/smbus_eeprom.h"
#include "hw/rtc/mc146818rtc.h"
#include "sysemu/kvm.h"
-#include "hw/kvm/clock.h"
+#include "hw/i386/kvm/clock.h"
#include "hw/pci-host/q35.h"
#include "hw/pci/pcie_port.h"
#include "hw/qdev-properties.h"
--
2.41.0
next prev parent reply other threads:[~2023-08-31 13:17 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-31 12:56 [PULL 00/41] Misc patches for 2023-08-31 Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 01/41] accel: Remove HAX accelerator Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 02/41] accel/tcg: spelling fixes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 03/41] qemu/uri: Use QueryParams type definition Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 04/41] bulk: Do not declare function prototypes using 'extern' keyword Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 05/41] hw/net/i82596: Include missing 'exec/address-spaces.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 06/41] hw/dma/etraxfs: Include missing 'exec/memory.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 07/41] exec/address-spaces.h: Remove unuseful 'exec/memory.h' include Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 08/41] target/ppc/pmu: Include missing 'qemu/timer.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 09/41] target/riscv/pmu: Restrict 'qemu/log.h' include to source Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 10/41] target/translate: Include missing 'exec/cpu_ldst.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 11/41] target/translate: Remove unnecessary " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 12/41] target/translate: Restrict 'exec/cpu_ldst.h' to user emulation Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 13/41] target/helpers: Remove unnecessary 'exec/cpu_ldst.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 14/41] target/helpers: Remove unnecessary 'qemu/main-loop.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 15/41] target/mips: Remove unused headers in lcsr_helper.c Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 16/41] target/xtensa: Include missing 'qemu/atomic.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 17/41] qemu/processor: Remove unused " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 18/41] exec/translation-block: Clean up includes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 19/41] chardev/char-fe: Document FEWatchFunc typedef Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 20/41] hw/char: Have FEWatchFunc handlers return G_SOURCE_CONTINUE/REMOVE Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 21/41] hw/char/pl011: Restrict MemoryRegionOps implementation access sizes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 22/41] hw/char/pl011: Display register name in trace events Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 23/41] hw/char/pl011: Remove duplicated PL011_INT_[RT]X definitions Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 24/41] hw/char/pl011: Replace magic values by register field definitions Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 25/41] hw/i2c/pmbus_device: Fix modifying QOM class internals from instance Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 26/41] hw/i2c: spelling fixes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 27/41] hw/ide: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 28/41] hw/display: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 29/41] hw/mips: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 30/41] hw/sd: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 31/41] hw/usb: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 32/41] hw/usb/hcd-xhci: Avoid variable-length array in xhci_get_port_bandwidth() Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 33/41] hw/i386: Remove unuseful kvmclock_create() stub Philippe Mathieu-Daudé
2023-08-31 12:56 ` Philippe Mathieu-Daudé [this message]
2023-08-31 12:56 ` [PULL 35/41] util/fifo8: Fix typo in fifo8_push_all() description Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 36/41] util: spelling fixes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 37/41] ui: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 38/41] docs/style: permit inline loop variables Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 39/41] meson: Fix MESONINTROSPECT parsing Philippe Mathieu-Daudé
2023-08-31 13:06 ` Michael Tokarev
2023-08-31 13:47 ` Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 40/41] build: Only define OS_OBJECT_USE_OBJC with gcc Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 41/41] tests/tcg/aarch64: Rename bti-crt.inc.c -> bti-crt.c.inc Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230831125646.67855-35-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=eduardo@habkost.net \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=slp@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).