On 08/12/2013 10:31 PM, Dong Xu Wang wrote: > This patch moves the default value entirely to QemuOptDesc. > > When getting the value of an option that hasn't been set, and > QemuOptDesc has a default value, return that. Else, behave as > before. > ... > Else, return NULL. > > Signed-off-by: Dong Xu Wang <wdon...@linux.vnet.ibm.com> > Reviewed-by: Eric Blake <ebl...@redhat.com> > > v13->v14: > 1) change code style. > 2) assert errors. > > Signed-off-by: Dong Xu Wang <wdon...@linux.vnet.ibm.com> > > Conflicts: > util/qemu-option.c > ---
Awkward. You should never have a 'Conflicts:' section on an upstream patch (except for maintainers resolving trivial conflicts during a merge operation); and this is another case of needing to move your submission changelog after the ---. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
