From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: vmwarevga merge clash Date: Wed, 19 Mar 2008 14:45:03 +0200 Message-ID: <47E10ACF.90603@qumranet.com> References: <47DF68A8.8000709@qumranet.com> <47E00AA4.4050707@codemonkey.ws> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: KVM To: Anthony Liguori Return-path: In-Reply-To: <47E00AA4.4050707@codemonkey.ws> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces@lists.sourceforge.net Errors-To: kvm-devel-bounces@lists.sourceforge.net List-Id: kvm.vger.kernel.org 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/