openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: Remove remnants of removing the fake emulator output 

Coverity determined that 'emulator' could no longer be set and determined the
code was dead.  Looking through the history, I discovered commit-id ed769e18
removed code originally added by commit-id 9237e955 and further modified by
commit-id 6a7e7c4f.
This commit is contained in:
John Ferlan 2013-01-08 16:21:51 -05:00 committed by Eric Blake
parent aafe41971c
commit 5a4af2a7d6
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/qemuxml2argvtest.c
View File

@ -91,7 +91,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
virDomainChrSourceDef monitor_chr; virDomainChrSourceDef monitor_chr;
virConnectPtr conn; virConnectPtr conn;
char *log = NULL; char *log = NULL;
char *emulator = NULL;
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
if (!(conn = virGetConnect())) if (!(conn = virGetConnect()))
@ -173,15 +172,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
if (!(actualargv = virCommandToString(cmd))) if (!(actualargv = virCommandToString(cmd)))
goto out; goto out;
if (emulator) {
/* Skip the abs_srcdir portion of replacement emulator. */
char *start_skip = strstr(actualargv, abs_srcdir);
char *end_skip = strstr(actualargv, emulator);
if (!start_skip || !end_skip)
goto out;
memmove(start_skip, end_skip, strlen(end_skip) + 1);
}
len = virtTestLoadFile(cmdline, &expectargv); len = virtTestLoadFile(cmdline, &expectargv);
if (len < 0) if (len < 0)
goto out; goto out;
@ -203,7 +193,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
out: out:
VIR_FREE(log); VIR_FREE(log);
VIR_FREE(emulator);
VIR_FREE(expectargv); VIR_FREE(expectargv);
VIR_FREE(actualargv); VIR_FREE(actualargv);
virCommandFree(cmd); virCommandFree(cmd);