Re: [libvirt] [PATCH v3 01/13] Introduce a virQEMUDriverConfigPtr object
On 02/01/2013 12:18 PM, Daniel P. Berrange wrote:
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index ee48333..46c1892 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
Sorry for not noticing earlier, but
- if (!(driver->vncTLSx509certdir = strdup(SYSCONFDIR
"/pki/libvirt-vnc")))
+ if (!(cfg->vncListen = strdup("127.0.0.1")))
+ goto no_memory;
+
+ if (!(cfg->vncTLSx509certdir
+ = strdup(SYSCONFDIR "/pki/libvirt-vnc")))
goto no_memory;
this indirectly breaks "make check" with prefix=/usr/local
- if (!(driver->spiceTLSx509certdir
+ if (!(cfg->spiceTLSx509certdir
= strdup(SYSCONFDIR "/pki/libvirt-spice")))
goto no_memory;
dito
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
- driver.vncTLS = 1;
- driver.vncTLSx509verify = 1;
- driver.vncTLSx509certdir = strdup("/etc/pki/tls/qemu");
because we
lose the capability to overwrite the driver config
in the test cases.
We should either allow to override config options, i.e. something
like virQEMUDriverConfigNew(bool privileged, const char *sysconfdir)
or let some of the offending qemuxml2argvdataxxx.args files by
created from .args.in files by configure.
--
Mit freundlichen Grüßen/Kind Regards
Viktor Mihajlovski
IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martin Jetter
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294