From: Avi Kivity <avi@qumranet.com>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: KVM <kvm-devel@lists.sourceforge.net>
Subject: Re: vmwarevga merge clash
Date: Wed, 19 Mar 2008 14:45:03 +0200 [thread overview]
Message-ID: <47E10ACF.90603@qumranet.com> (raw)
In-Reply-To: <47E00AA4.4050707@codemonkey.ws>
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/
prev parent reply other threads:[~2008-03-19 12:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-18 7:00 vmwarevga merge clash Avi Kivity
2008-03-18 18:32 ` Anthony Liguori
2008-03-19 12:45 ` Avi Kivity [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=47E10ACF.90603@qumranet.com \
--to=avi@qumranet.com \
--cc=anthony@codemonkey.ws \
--cc=kvm-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.