On 21/09/2018 10:20, Roman Kagan wrote: > A significant part of hyperv.c is not actually tied to x86, and can > be moved to hw/. > > This will allow to maintain most of Hyper-V and VMBus > target-independent, and to avoid conflicts with inclusion of > arch-specific headers down the road in VMBus implementation. > > Also this stuff can now be opt-out with CONFIG_HYPERV. > > Signed-off-by: Roman Kagan <[email protected]>
We can squash this in too: diff --git a/hw/Makefile.objs b/hw/Makefile.objs index b8f4675219..30722ccf98 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -9,7 +9,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += cpu/ devices-dirs-$(CONFIG_SOFTMMU) += display/ devices-dirs-$(CONFIG_SOFTMMU) += dma/ devices-dirs-$(CONFIG_SOFTMMU) += gpio/ -devices-dirs-$(CONFIG_SOFTMMU) += hyperv/ +devices-dirs-$(CONFIG_HYPERV) += hyperv/ devices-dirs-$(CONFIG_SOFTMMU) += i2c/ devices-dirs-$(CONFIG_SOFTMMU) += ide/ devices-dirs-$(CONFIG_SOFTMMU) += input/ diff --git a/hw/hyperv/Makefile.objs b/hw/hyperv/Makefile.objs index 19928b726e..edaca2f763 100644 --- a/hw/hyperv/Makefile.objs +++ b/hw/hyperv/Makefile.objs @@ -1 +1,2 @@ -obj-$(CONFIG_HYPERV) += hyperv.o +obj-y += hyperv.o +obj-$(CONFIG_HYPERV_TESTDEV) += hyperv_testdev.o diff --git a/hw/misc/hyperv_testdev.c b/hw/hyperv/hyperv_testdev.c similarity index 100% rename from hw/misc/hyperv_testdev.c rename to hw/hyperv/hyperv_testdev.c diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 6d50b03cfd..680350b3c3 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -71,7 +71,6 @@ obj-$(CONFIG_IOTKIT_SYSCTL) += iotkit-sysctl.o obj-$(CONFIG_IOTKIT_SYSINFO) += iotkit-sysinfo.o obj-$(CONFIG_PVPANIC) += pvpanic.o -obj-$(CONFIG_HYPERV_TESTDEV) += hyperv_testdev.o obj-$(CONFIG_AUX) += auxbus.o obj-$(CONFIG_ASPEED_SOC) += aspeed_scu.o aspeed_sdmc.o obj-$(CONFIG_MSF2) += msf2-sysreg.o Paolo
