On 05/22/2014 07:47 AM, Peter Krempa wrote:
Currently the protocol type with index 0 was NBD which made it hard
to
distinguish whether the protocol type was actually assigned. Add a new
protocol type with index 0 to distinguish it explicitly.
---
Notes:
Version 2:
- fixed condition in virDomainDiskSourceParse so that "none" isn't
accepted
- fixed typo in comment in qemuNetworkDriveGetPort()
- fixed commit message
src/conf/domain_conf.c | 2 +-
src/qemu/qemu_command.c | 5 ++++-
src/qemu/qemu_driver.c | 3 +++
src/util/virstoragefile.c | 1 +
src/util/virstoragefile.h | 1 +
5 files changed, 10 insertions(+), 2 deletions(-)
ACK with one more nit.
Previous ack on 4 and 5 still stands, too.
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 4bc71c8..4fb2e1d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4989,7 +4989,7 @@ virDomainDiskSourceParse(xmlNodePtr node,
goto cleanup;
}
- if ((src->protocol = virStorageNetProtocolTypeFromString(protocol)) < 0){
+ if ((src->protocol = virStorageNetProtocolTypeFromString(protocol)) <= 0){
Worth adding the space before { as long as you are touching this line.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org