External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 04:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/conf.c: documentation cleanups from Jim Meyering

Browse Source 
* tests/conftest.c: Use fwrite, not printf, since the
  result buffer is not NUL-terminatedi, from Jim Meyering.
* tests/qemuxml2argvtest.c: Initialize vm.migrateFrom[0],
  to avoid "read-uninitialized" error from within
  qemudBuildCommandLinei, from Jim Meyering.
Daniel
This commit is contained in:
Daniel Veillard 2007-10-19 08:29:13 +00:00
parent 171afdf694
commit 69b9fcf297
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Fri Oct 19 10:24:52 CEST 2007 Daniel Veillard <veillard@redhat.com>
* src/conf.c: documentation cleanups from Jim Meyering
* tests/conftest.c: Use fwrite, not printf, since the
result buffer is not NUL-terminated.
* tests/qemuxml2argvtest.c: Initialize vm.migrateFrom[0],
to avoid "read-uninitialized" error from within
qemudBuildCommandLine.
Wed Oct 17 11:27:00 BST 2007 Richard W.M. Jones <rjones@redhat.com> Wed Oct 17 11:27:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
* libvirt.spec.in (BuildRequires): Add "qemu" (Jim Meyering). * libvirt.spec.in (BuildRequires): Add "qemu" (Jim Meyering).

4
src/conf.c
View File

@ -1,7 +1,7 @@
/** /**
* conf.c: parser for a subset of the Python encoded Xen configuration files * conf.c: parser for a subset of the Python encoded Xen configuration files
* *
* Copyright (C) 2006 Red Hat, Inc. * Copyright (C) 2006, 2007 Red Hat, Inc.
* *
* See COPYING.LIB for the License of this software * See COPYING.LIB for the License of this software
* *
@ -916,7 +916,7 @@ error:
/** /**
* __virConfWriteMem: * __virConfWriteMem:
* @memory: pointer to the memory to store the config file * @memory: pointer to the memory to store the config file
* @len: pointer to the lenght in byte of the store, on output the size * @len: pointer to the length in bytes of the store, on output the size
* @conf: the conf * @conf: the conf
* *
* Writes a configuration file back to a memory area. @len is an IN/OUT * Writes a configuration file back to a memory area. @len is an IN/OUT

5
tests/conftest.c
View File

@ -24,7 +24,10 @@ int main(int argc, char **argv) {
fprintf(stderr, "Failed to serialize %s back\n", argv[1]); fprintf(stderr, "Failed to serialize %s back\n", argv[1]);
exit(3); exit(3);
} }
printf("%s", buffer);
virConfFree(conf); virConfFree(conf);
if (fwrite(buffer, len, 1, stdout) != len) {
fprintf(stderr, "Write failed\n");
exit(1);
}
exit(0); exit(0);
} }

1
tests/qemuxml2argvtest.c
View File

@ -40,6 +40,7 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *cmd) {
vm.qemuVersion = 0 * 1000 * 100 + (8 * 1000) + 1; vm.qemuVersion = 0 * 1000 * 100 + (8 * 1000) + 1;
vm.qemuCmdFlags = QEMUD_CMD_FLAG_VNC_COLON | vm.qemuCmdFlags = QEMUD_CMD_FLAG_VNC_COLON |
QEMUD_CMD_FLAG_NO_REBOOT; QEMUD_CMD_FLAG_NO_REBOOT;
vm.migrateFrom[0] = '\0';
vmdef->vncActivePort = vmdef->vncPort; vmdef->vncActivePort = vmdef->vncPort;