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

Update QEMU test cases for new file locations & API renames 

* qemuargv2xmltest.c, qemuhelptest.c,
  qemuxml2argvtest.c, testutilsqemu.c: Update includes and
  cope with API renames
This commit is contained in:
Daniel P. Berrange 2010-12-17 16:41:51 +00:00
parent acabd9d0ff
commit 1d16f05674
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemuargv2xmltest.c
View File

@ -13,7 +13,7 @@
# include "internal.h"
# include "testutils.h"
# include "qemu/qemu_conf.h"
# include "qemu/qemu_command.h"
# include "testutilsqemu.h"

6
tests/qemuhelptest.c
View File

@ -6,7 +6,7 @@
# include <stdlib.h>
# include "testutils.h"
# include "qemu/qemu_conf.h"
# include "qemu/qemu_capabilities.h"
# define MAX_HELP_OUTPUT_SIZE 1024*64
@ -50,8 +50,8 @@ static int testHelpStrParsing(const void *data)
if (virtTestLoadFile(path, &help, MAX_HELP_OUTPUT_SIZE) < 0)
return -1;
if (qemudParseHelpStr("QEMU", help, &flags,
&version, &is_kvm, &kvm_version) == -1)
if (qemuCapsParseHelpStr("QEMU", help, &flags,
&version, &is_kvm, &kvm_version) == -1)
return -1;
if (flags != info->flags) {

9
tests/qemuxml2argvtest.c
View File

@ -13,7 +13,8 @@
# include "internal.h"
# include "testutils.h"
# include "qemu/qemu_conf.h"
# include "qemu/qemu_capabilities.h"
# include "qemu/qemu_command.h"
# include "datatypes.h"
# include "cpu/cpu_map.h"
@ -110,9 +111,9 @@ static int testCompareXMLToArgvFiles(const char *xml,
free(virtTestLogContentAndReset());
virResetLastError();
if (!(cmd = qemudBuildCommandLine(conn, &driver,
vmdef, &monitor_chr, false, flags,
migrateFrom, NULL, VIR_VM_OP_CREATE)))
if (!(cmd = qemuBuildCommandLine(conn, &driver,
vmdef, &monitor_chr, false, flags,
migrateFrom, NULL, VIR_VM_OP_CREATE)))
goto fail;
if (!!virGetLastError() != expectError) {

6
tests/testutilsqemu.c
View File

@ -8,6 +8,7 @@
# include "memory.h"
# include "cpu_conf.h"
# include "qemu/qemu_driver.h"
# include "qemu/qemu_domain.h"
static virCapsGuestMachinePtr *testQemuAllocMachines(int *nmachines)
{
@ -102,10 +103,7 @@ virCapsPtr testQemuCapsInit(void) {
(machines = testQemuAllocMachines(&nmachines)) == NULL)
goto cleanup;
caps->ns.parse = qemuDomainDefNamespaceParse;
caps->ns.free = qemuDomainDefNamespaceFree;
caps->ns.format = qemuDomainDefNamespaceFormatXML;
caps->ns.href = qemuDomainDefNamespaceHref;
qemuDomainSetNamespaceHooks(caps);
if ((guest = virCapabilitiesAddGuest(caps, "hvm", "i686", 32,
"/usr/bin/qemu", NULL,