External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 20:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen: Remove virConnectPtr from virXendError

Browse Source
This commit is contained in:
Matthias Bolte 2010-04-03 01:10:49 +02:00
parent 2127b42b46
commit 5cec7af469
3 changed files with 254 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

528
src/xen/xend_internal.c
View File

File diff suppressed because it is too large Load Diff

24
src/xen/xend_internal.h
View File

@ -96,12 +96,11 @@ xenDaemonDomainFetch(virConnectPtr xend,
const char *name,
const char *cpus);
int xend_parse_sexp_desc_char(virConnectPtr conn,
virBufferPtr buf,
const char *devtype,
int portNum,
const char *value,
const char *tty);
int xend_parse_sexp_desc_char(virBufferPtr buf,
const char *devtype,
int portNum,
const char *value,
const char *tty);
virDomainDefPtr
xenDaemonParseSxprString(virConnectPtr conn,
@ -109,21 +108,18 @@ xenDaemonParseSxprString(virConnectPtr conn,
int xendConfigVersion);
int
xenDaemonParseSxprSound(virConnectPtr conn,
virDomainDefPtr def,
xenDaemonParseSxprSound(virDomainDefPtr def,
const char *str);
virDomainChrDefPtr
xenDaemonParseSxprChar(virConnectPtr conn,
const char *value,
xenDaemonParseSxprChar(const char *value,
const char *tty);
int
xenDaemonFormatSxprChr(virConnectPtr conn,
virDomainChrDefPtr def,
xenDaemonFormatSxprChr(virDomainChrDefPtr def,
virBufferPtr buf);
int
xenDaemonFormatSxprSound(virConnectPtr conn,
virDomainDefPtr def,
xenDaemonFormatSxprSound(virDomainDefPtr def,
virBufferPtr buf);
char *

16
src/xen/xm_internal.c
View File

@ -1415,7 +1415,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
if (xenXMConfigGetString(conn, conf, "parallel", &str, NULL) < 0)
goto cleanup;
if (str && STRNEQ(str, "none") &&
!(chr = xenDaemonParseSxprChar(conn, str, NULL)))
!(chr = xenDaemonParseSxprChar(str, NULL)))
goto cleanup;
if (chr) {
@ -1432,7 +1432,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
if (xenXMConfigGetString(conn, conf, "serial", &str, NULL) < 0)
goto cleanup;
if (str && STRNEQ(str, "none") &&
!(chr = xenDaemonParseSxprChar(conn, str, NULL)))
!(chr = xenDaemonParseSxprChar(str, NULL)))
goto cleanup;
if (chr) {
@ -1445,7 +1445,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
def->nserials++;
}
} else {
if (!(def->console = xenDaemonParseSxprChar(conn, "pty", NULL)))
if (!(def->console = xenDaemonParseSxprChar("pty", NULL)))
goto cleanup;
def->console->targetType = VIR_DOMAIN_CHR_TARGET_TYPE_CONSOLE;
}
@ -1455,7 +1455,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
goto cleanup;
if (str &&
xenDaemonParseSxprSound(conn, def, str) < 0)
xenDaemonParseSxprSound(def, str) < 0)
goto cleanup;
}
@ -2572,7 +2572,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
char *str;
int ret;
ret = xenDaemonFormatSxprChr(conn, def->parallels[0], &buf);
ret = xenDaemonFormatSxprChr(def->parallels[0], &buf);
str = virBufferContentAndReset(&buf);
if (ret == 0)
ret = xenXMConfigSetString(conf, "parallel", str);
@ -2589,7 +2589,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
char *str;
int ret;
ret = xenDaemonFormatSxprChr(conn, def->serials[0], &buf);
ret = xenDaemonFormatSxprChr(def->serials[0], &buf);
str = virBufferContentAndReset(&buf);
if (ret == 0)
ret = xenXMConfigSetString(conf, "serial", str);
@ -2605,9 +2605,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
if (def->sounds) {
virBuffer buf = VIR_BUFFER_INITIALIZER;
char *str = NULL;
int ret = xenDaemonFormatSxprSound(conn,
def,
&buf);
int ret = xenDaemonFormatSxprSound(def, &buf);
str = virBufferContentAndReset(&buf);
if (ret == 0)
ret = xenXMConfigSetString(conf, "soundhw", str);