Anthony Liguori wrote: > Avi Kivity wrote: > >> Trying to merge qemu-cvs, there's a conflict in vmwarevga between two >> changes that appear to be identical in purpose, only implemented >> differently: 6d262b07a2046ed1fa0ec3fd61f00efbfcd5a9ef (master) and >> 5aa90452c52e3a914e1f6bbf34331507fd7c5d52 (qemu-cvs). >> >> I think the correct action is to drop the local changes and accept the >> qemu-cvs commit. Can you confirm? >> > > qemu cvs still sets the BAR registers which KVM didn't seem to like. > However, I believe that what is in QEMU CVS is correct and that removing > explicit BAR register setting is simply hiding a KVM bug. I'd suggest > dropping the local changes and I'll investigate further. > >
Okay, did just that. vmwarevga.c is now identical to qemu-cvs. -- error compiling committee.c: too many arguments to function ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
