vmwarevga merge clash
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?
Signature · 7 lines
Do not meddle in the internals of kernels, for they are subtle and quick to panic. ------------------------------------------------------------------------- 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/
Quoted 7 lines · Avi Kivity
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) and5aa90452c52e3a914e1f6bbf34331507fd7c5d52(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.
Regards,
Anthony Liguori
-------------------------------------------------------------------------
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/
Quoted 7 lines · Anthony Liguori
Quoted 5 lines · Avi Kivity
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) and5aa90452c52e3a914e1f6bbf34331507fd7c5d52(qemu-cvs).
Quoted 10 lines
Quoted 3 lines
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.
Signature · 7 lines
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/