On 02/17/2014 06:43 AM, Paolo Bonzini wrote: > Before: > $ qemu-io-old > qemu-io-old> open -r -o file.driver=nbd > qemu-io-old: can't open device (null): Could not open image: Invalid > argument > $ ./qemu-io-old > qemu-io-old> open -r -o file.driver=nbd,file.host=foo,file.path=bar > path and host may not be used at the same time. > qemu-io-old: can't open device (null): Could not open image: Invalid > argument >
> + if (qdict_haskey(options, "path") == qdict_haskey(options, "host")) {
> + if (qdict_haskey(options, "path")) {
> qerror_report(ERROR_CLASS_GENERIC_ERROR, "path and host may not "
> "be used at the same time.");
Pre-existing, but we tend to not use trailing '.' in error messages...
> - return -EINVAL;
> + } else {
> + qerror_report(ERROR_CLASS_GENERIC_ERROR, "one of path and host "
> + "must be specified.");
so you might as well fix the old one and not add a new instance of it.
But that's minor enough that I don't mind:
Reviewed-by: Eric Blake <ebl...@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
