On 12/15/10 17:47, Markus Armbruster wrote: > jes.soren...@redhat.com writes: > >> From: Jes Sorensen <jes.soren...@redhat.com> >> >> This cleans up the handling of image size in img_create() by parsing >> the value early, and then only setting it once if a value has been >> added as the last argument to the command line. >> >> Signed-off-by: Jes Sorensen <jes.soren...@redhat.com> >> --- >> qemu-img.c | 14 ++++++++------ >> 1 files changed, 8 insertions(+), 6 deletions(-) >> > > Patch conflicts with commit c2abccec.
ARGH :( > This switches parsing of the size argument from parse_option_size() (via > set_option_parameter()) to strtosz(). I'm fine with that, but: > > * Before: > > $ qemu-img create xxx xxx > Parameter 'size' expects a size > You may use k, M, G or T suffixes for kilobytes, megabytes, gigabytes and > terabytes. > qemu-img: Image creation needs a size parameter > > * After: > > $ qemu-img create xxx xxx > qemu-img: Image creation needs a size parameter > > Intentional? This was addressed in the later revision when I introduced strtosz_suffix() Cheers, Jes
