On Thu, Dec 21, 2017 at 16:27:15 +0800, lichstor@xxxxxxxxx wrote: > From: zhangshengyu <zhangshengyu@xxxxxxxxxxxxxx> > > --- > src/conf/domain_conf.c | 10 ++++++ > src/qemu/qemu_block.c | 24 +++++++++++-- > src/qemu/qemu_command.c | 3 ++ > src/qemu/qemu_parse_command.c | 10 +++++- > src/storage/storage_backend_gluster.c | 1 + > src/util/virstoragefile.c | 3 +- > src/util/virstoragefile.h | 1 + > .../qemuargv2xmldata/disk-drive-network-iser.args | 25 +++++++++++++ > tests/qemuargv2xmldata/disk-drive-network-iser.xml | 41 ++++++++++++++++++++++ > tests/qemuargv2xmltest.c | 1 + > .../qemuxml2argvdata/disk-drive-network-iser.args | 29 +++++++++++++++ > tests/qemuxml2argvdata/disk-drive-network-iser.xml | 37 +++++++++++++++++++ > tests/qemuxml2argvtest.c | 1 + > .../qemuxml2xmloutdata/disk-drive-network-iser.xml | 41 ++++++++++++++++++++++ > tests/qemuxml2xmltest.c | 1 + > 15 files changed, 224 insertions(+), 4 deletions(-) > create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser.args > create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser.xml > create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser.args > create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser.xml > create mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-iser.xml > > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c > index 9a62bc472..5767575d0 100644 > --- a/src/conf/domain_conf.c > +++ b/src/conf/domain_conf.c > @@ -7080,6 +7080,7 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node, > virStorageNetHostDefPtr *hosts, > size_t *nhosts) > { > + char *transport = NULL; > xmlNodePtr child; > > for (child = node->children; child; child = child->next) { > @@ -7091,6 +7092,11 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node, > } > } > > + if ((*hosts) && (transport = virXMLPropString(node, "transport"))) { > + //VIR_WARN("missing network source transport type"); We don't allow C99 style comments. Also apparently you STILL did not run the test suite before submission: ../build-aux/test-driver: line 107: 2113 Segmentation fault "$@" > $log_file 2>&1 FAIL: qemuargv2xmltest ../build-aux/test-driver: line 107: 2051 Segmentation fault "$@" > $log_file 2>&1 FAIL: qemuxml2xmltest FAIL: virschematest
Attachment:
signature.asc
Description: PGP signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list