* vmwarevga merge clash
@ 2008-03-18 7:00 Avi Kivity
2008-03-18 18:32 ` Anthony Liguori
0 siblings, 1 reply; 3+ messages in thread
From: Avi Kivity @ 2008-03-18 7:00 UTC (permalink / raw)
To: Anthony Liguori; +Cc: KVM
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?
--
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/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: vmwarevga merge clash
2008-03-18 7:00 vmwarevga merge clash Avi Kivity
@ 2008-03-18 18:32 ` Anthony Liguori
2008-03-19 12:45 ` Avi Kivity
0 siblings, 1 reply; 3+ messages in thread
From: Anthony Liguori @ 2008-03-18 18:32 UTC (permalink / raw)
To: Avi Kivity; +Cc: KVM
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.
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/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: vmwarevga merge clash
2008-03-18 18:32 ` Anthony Liguori
@ 2008-03-19 12:45 ` Avi Kivity
0 siblings, 0 replies; 3+ messages in thread
From: Avi Kivity @ 2008-03-19 12:45 UTC (permalink / raw)
To: Anthony Liguori; +Cc: KVM
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/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-03-19 12:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox