[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH V6 09/10] tests: add cases for inherited struct
From: |
Luiz Capitulino |
Subject: |
Re: [Qemu-devel] [PATCH V6 09/10] tests: add cases for inherited struct and union with discriminator |
Date: |
Thu, 13 Feb 2014 10:11:24 -0500 |
On Thu, 13 Feb 2014 15:53:30 +0100
Markus Armbruster <address@hidden> wrote:
> Wenchao Xia <address@hidden> writes:
>
> > Test for inherit and complex union.
>
> This patch conflicts badly with my test coverage work in "[PATCH v2
> 00/13] qapi: Test coverage & clean up generated code". My series
> systematically covers code generation in scripts/qapi*py, and that takes
> me seven patches.
>
> If I put your patch first, mine all explode, and I get to start over.
>
> Putting my series first looks far easier to resolve, because only this
> one patch conflicts. Would you mind me rebasing your series on top of
> mine?
If it's only this patch that causes conflicts, what about the
following:
1. I apply patches 1-8 plus patch 10
2. Markus rebases patch 9 and adds it to his series
3. Markus post a new version
Does this work for everyone?
The only drawback is that both series will miss today's boat, but this
would happen at this point anyway.
- Re: [Qemu-devel] [PATCH V6 02/10] qapi script: add check for duplicated key, (continued)
- [Qemu-devel] [PATCH V6 01/10] qapi script: remember enum values, Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V6 06/10] qapi script: support pre-defined enum type as discriminator in union, Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V6 04/10] qapi script: code move for generate_enum_name(), Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V6 05/10] qapi script: use same function to generate enum string, Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V6 08/10] qapi script: do not allow string discriminator, Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V6 07/10] qapi: convert BlockdevOptions to use enum discriminator, Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V6 09/10] tests: add cases for inherited struct and union with discriminator, Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V6 10/10] qapi script: do not add "_" for every capitalized char in enum, Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V6 03/10] qapi script: check correctness of discriminator values in union, Wenchao Xia, 2014/02/11
- Re: [Qemu-devel] [PATCH V6 03/10] qapi script: check correctness of discriminator values in union, Markus Armbruster, 2014/02/13
- Re: [Qemu-devel] [PATCH V6 03/10] qapi script: check correctness of discriminator values in union, Wenchao Xia, 2014/02/13
- Re: [Qemu-devel] [PATCH V6 03/10] qapi script: check correctness of discriminator values in union, Markus Armbruster, 2014/02/14
- Re: [Qemu-devel] [PATCH V6 03/10] qapi script: check correctness of discriminator values in union, Wenchao Xia, 2014/02/16
- Re: [Qemu-devel] [PATCH V6 03/10] qapi script: check correctness of discriminator values in union, Markus Armbruster, 2014/02/17
- Re: [Qemu-devel] [PATCH V6 03/10] qapi script: check correctness of discriminator values in union, Luiz Capitulino, 2014/02/17
Re: [Qemu-devel] [PATCH V6 00/10] qapi script: support enum as discriminator and better enum name, Eric Blake, 2014/02/11