On 20.04.21 12:36, Claudio Fontana wrote:
> we stop short of renaming the actual qom object though,
> so type remains TYPE_QEMU_S390_TOD, ie "s390-tod-qemu".
>
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> ---
> hw/s390x/{tod-qemu.c => tod-tcg.c} | 0
> hw/s390x/meson.build | 2 +-
> 2 files changed, 1 insertion(+), 1 deletion(-)
> rename hw/s390x/{tod-qemu.c => tod-tcg.c} (100%)
>
> diff --git a/hw/s390x/tod-qemu.c b/hw/s390x/tod-tcg.c
> similarity index 100%
> rename from hw/s390x/tod-qemu.c
> rename to hw/s390x/tod-tcg.c
> diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
> index a4d355b4db..72f48635cb 100644
> --- a/hw/s390x/meson.build
> +++ b/hw/s390x/meson.build
> @@ -25,7 +25,7 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
> 'pv.c',
> ))
> s390x_ss.add(when: 'CONFIG_TCG', if_true: files(
> - 'tod-qemu.c',
> + 'tod-tcg.c',
> ))
>
> s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-ccw.c'))
>
I'd just swap this patch with #1 -- or even squash them.
--
Thanks,
David / dhildenb