target-i386/kvm.c vs. qemu-kvm-x86.c

Hi,

the lastest qemu -> qemu-kvm sync pulled the kvm_trim_features() function from QEMU's target-i386/kvm.c into the qemu-kvm tree, where it is already defined in qemu-kvm-x86.c (which does not exist in qemu.git). AFAICS qemu-kvm only uses the last file, so the target-i386 code is not triggered.
What is the future of these two files? Will one vanish? Will they be merged? Where to put new features in?

Thanks and regards,
Andre.

Andre Przywara
AMD-OSRC (Dresden)
Tel: x29712

All of the above.

The goal is to merge the features of qemu-kvm.c and qemu-kvm-x86.c into kvm-all.c and kvm.c, eventually removing the former. In general new features need to be added in both.

error compiling committee.c: too many arguments to function