From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KXu63-0001hY-IM for qemu-devel@nongnu.org; Tue, 26 Aug 2008 04:40:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KXu61-0001gY-Rl for qemu-devel@nongnu.org; Tue, 26 Aug 2008 04:40:15 -0400 Received: from [199.232.76.173] (port=58108 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KXu61-0001gJ-Eb for qemu-devel@nongnu.org; Tue, 26 Aug 2008 04:40:13 -0400 Received: from smtp.ctxuk.citrix.com ([62.200.22.115]:20185 helo=SMTP.EU.CITRIX.COM) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KXu61-00060Y-8i for qemu-devel@nongnu.org; Tue, 26 Aug 2008 04:40:13 -0400 Date: Tue, 26 Aug 2008 09:40:12 +0100 Subject: Re: [Xen-devel] Re: [Qemu-devel] [PATCH 1/2] xenner: add event channel implementation. From: Keir Fraser Message-ID: In-Reply-To: <48B3BE88.8090003@redhat.com> Mime-version: 1.0 Content-type: text/plain; charset="US-ASCII" Content-transfer-encoding: 7bit Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: xen-devel@lists.xensource.com, qemu-devel@nongnu.org On 26/8/08 09:27, "Gerd Hoffmann" wrote: >> Afaics there's some workflow or patchflow to >> be worked out here: > > Workflow could look like this: > > (1) Ian merges upstream into qemu-xen. > (2) I'll rebase my patches to the resulting tree. > (3) Merge both patchsets, into the trees. > > That should result in almost identical hw/xen* files in both trees, so > we don't end up with a big mess when Ian merges again. That sounds like a plausible avenue. I don't want to speak for Ian though: he'll be the one doing most of the work on the qemu-xen side. >> I can't see why we would take Gerd's patches wholesale >> when we have a working patchset already. > > Which patchset you are refering to? As far I know Ian & Samuel are > focusing on getting the changes to generic qemu code upstream (such as > serial and ide fixes which ran over the qemu-devel list already), not on > the xen support bits. Sorry, by patchset I meant qemu-xen. Bad confusing terminology on my part. -- Keir