NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename 'qemuCapsXXX' to 'virQEMUCapsXXX'

Browse Source 
To avoid confusion between 'virCapsPtr' and 'qemuCapsPtr'
do some renaming of various fucntions/variables. All
instances of 'qemuCapsPtr' are renamed to 'qemuCaps'. To
avoid that clashing with the 'qemuCaps' typedef though,
rename the latter to virQEMUCaps.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange
2013-02-01 13:48:58 +00:00
parent fed92f08db
commit 32803ba409
14 changed files with 1215 additions and 1213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/qemuxmlnstest.c
View File

@@ -25,7 +25,7 @@ static virQEMUDriver driver;
static int testCompareXMLToArgvFiles(const char *xml,
const char *cmdline,
qemuCapsPtr extraFlags,
virQEMUCapsPtr extraFlags,
const char *migrateFrom,
int migrateFd,
bool json,
@@ -76,7 +76,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto fail;
}
if (qemuCapsGet(extraFlags, QEMU_CAPS_DOMID))
if (virQEMUCapsGet(extraFlags, QEMU_CAPS_DOMID))
vmdef->id = 6;
else
vmdef->id = -1;
@@ -86,13 +86,13 @@ static int testCompareXMLToArgvFiles(const char *xml,
monitor_chr.data.nix.path = (char *)"/tmp/test-monitor";
monitor_chr.data.nix.listen = true;
qemuCapsSetList(extraFlags,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
QEMU_CAPS_NO_ACPI,
QEMU_CAPS_LAST);
virQEMUCapsSetList(extraFlags,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
QEMU_CAPS_NO_ACPI,
QEMU_CAPS_LAST);
if (qemuCapsGet(extraFlags, QEMU_CAPS_DEVICE))
if (virQEMUCapsGet(extraFlags, QEMU_CAPS_DEVICE))
qemuDomainAssignAddresses(vmdef, extraFlags, NULL);
log = virtTestLogContentAndReset();
@@ -101,7 +101,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
if (vmdef->os.arch == VIR_ARCH_X86_64 ||
vmdef->os.arch == VIR_ARCH_I686) {
qemuCapsSet(extraFlags, QEMU_CAPS_PCI_MULTIBUS);
virQEMUCapsSet(extraFlags, QEMU_CAPS_PCI_MULTIBUS);
}
if (qemuAssignDeviceAliases(vmdef, extraFlags) < 0)
@@ -157,7 +157,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
struct testInfo {
const char *name;
qemuCapsPtr extraFlags;
virQEMUCapsPtr extraFlags;
const char *migrateFrom;
int migrateFd;
bool json;
@@ -215,9 +215,9 @@ mymain(void)
struct testInfo info = { \
name, NULL, migrateFrom, migrateFd, json, expectError \
}; \
if (!(info.extraFlags = qemuCapsNew())) \
if (!(info.extraFlags = virQEMUCapsNew())) \
return EXIT_FAILURE; \
qemuCapsSetList(info.extraFlags, __VA_ARGS__, QEMU_CAPS_LAST); \
virQEMUCapsSetList(info.extraFlags, __VA_ARGS__, QEMU_CAPS_LAST);\
if (virtTestRun("QEMU XML-2-ARGV " name, \
1, testCompareXMLToArgvHelper, &info) < 0) \
ret = -1; \