| Message ID | 20230620083228.88796-3-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386: Cleanups around kvmclock_create() | expand |
Philippe Mathieu-Daudé <philmd@linaro.org> writes: > 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> > --- > RFC: No other arch had to implement this for 12 years, > safe enough to restrict to x86? Importantly the implementation is certainly in i386 only: Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
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 715c063eec..85fe41327c 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 a0553f70f7..9e6602dfde 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"
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> --- RFC: No other arch had to implement this for 12 years, safe enough to restrict to x86? --- {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%)