External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Teach qemuxml2argvtest about spapr-vio addresses

Browse Source 
We can't call qemuCapsExtractVersionInfo() from test code, because it
expects to be able to call the emulator, and for testing we have fake
emulators that can't be executed. For that reason qemuxml2argvtest.c
doesn't call qemuDomainAssignPCIAddresses(), instead it open codes its
own version.

That means we can't call qemuDomainAssignAddresses() from the test code,
instead we need to manually call qemuDomainAssignSpaprVioAddresses().

Also add logic to cope with qemuDomainAssignSpaprVioAddresses() failing,
so that we can write a test that checks for a known failure in there.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
This commit is contained in:
Michael Ellerman 2012-01-13 14:39:24 +11:00 committed by Eric Blake
parent 8611d9c3d8
commit 69dde2e653
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_command.c
View File

@ -735,7 +735,7 @@ qemuAssignSpaprVIOAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info,
return 0;
}
static int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def)
int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def)
{
int i, rc;

1
src/qemu/qemu_command.h
View File

@ -175,6 +175,7 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps,
bool *monJSON);
int qemuDomainAssignAddresses(virDomainDefPtr def);
int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def);
int qemuDomainAssignPCIAddresses(virDomainDefPtr def);
qemuDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def);

18
tests/qemuxml2argvtest.c
View File

@ -153,6 +153,13 @@ static int testCompareXMLToArgvFiles(const char *xml,
if (qemuCapsGet(extraFlags, QEMU_CAPS_DEVICE)) {
qemuDomainPCIAddressSetPtr pciaddrs;
if (qemuDomainAssignSpaprVIOAddresses(vmdef)) {
if (expectError)
goto ok;
goto fail;
}
if (!(pciaddrs = qemuDomainPCIAddressSetCreate(vmdef)))
goto fail;
@ -190,11 +197,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto fail;
}
if (expectError) {
/* need to suppress the errors */
virResetLastError();
}
if (!(actualargv = virCommandToString(cmd)))
goto fail;
@ -212,6 +214,12 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto fail;
}
ok:
if (expectError) {
/* need to suppress the errors */
virResetLastError();
}
ret = 0;
fail: