From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNIqQ-00042V-Ms for qemu-devel@nongnu.org; Tue, 11 Mar 2014 05:19:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNIqL-0004RL-Ng for qemu-devel@nongnu.org; Tue, 11 Mar 2014 05:19:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36392) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNIqL-0004RF-Fy for qemu-devel@nongnu.org; Tue, 11 Mar 2014 05:19:25 -0400 From: Markus Armbruster References: <1394463290-24929-1-git-send-email-armbru@redhat.com> <20140310121642.3a28896e@redhat.com> Date: Tue, 11 Mar 2014 10:19:20 +0100 In-Reply-To: <20140310121642.3a28896e@redhat.com> (Luiz Capitulino's message of "Mon, 10 Mar 2014 12:16:42 -0400") Message-ID: <87txb5w0rr.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH] tests/qapi-schema: Fix enum misuse in flat union type tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org Luiz Capitulino writes: > On Mon, 10 Mar 2014 15:54:50 +0100 > Markus Armbruster wrote: > >> Screwed up in commit 2fc0043. Currently harmless, because the enum >> values happen to be identical. > > I'm afraid this conflicts with Wenchao's series: > > [PATCH V9 00/10] qapi script: support enum as discriminator and > better enum name > > Which is already merged in my qmp queue: > > git://repo.or.cz/qemu/qmp-unstable.git queue/qmp Conflicts because it fixes the bug silently. If we want a record of the bug fix, we can either rebase his series on top of mine, or amend one of his commit messages. I'm not sure it's worth the bother, though. I can give it a try if you think it's worthwhile.