[libvirt] [PATCH] Adapt test suite to code movement in the QEMU driver
--- tests/qemuargv2xmltest.c | 1 + tests/qemuhelptest.c | 5 +++-- tests/qemuxml2argvtest.c | 8 +++++--- tests/testutilsqemu.c | 6 ++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index adff05a..dfb9d99 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -14,6 +14,7 @@ # include "internal.h" # include "testutils.h" # include "qemu/qemu_conf.h" +# include "qemu/qemu_command.h" # include "testutilsqemu.h" diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 6ff1feb..3f82692 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -7,6 +7,7 @@ # include "testutils.h" # include "qemu/qemu_conf.h" +# include "qemu/qemu_capabilities.h" # define MAX_HELP_OUTPUT_SIZE 1024*64 @@ -50,8 +51,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) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5387432..158204d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -14,6 +14,8 @@ # include "internal.h" # include "testutils.h" # include "qemu/qemu_conf.h" +# include "qemu/qemu_command.h" +# include "qemu/qemu_capabilities.h" # include "datatypes.h" # include "cpu/cpu_map.h" @@ -110,9 +112,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) { diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 72fc8aa..bfac307 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -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, -- 1.7.0.4
On 12/17/2010 08:59 AM, Matthias Bolte wrote:
--- tests/qemuargv2xmltest.c | 1 + tests/qemuhelptest.c | 5 +++-- tests/qemuxml2argvtest.c | 8 +++++--- tests/testutilsqemu.c | 6 ++---- 4 files changed, 11 insertions(+), 9 deletions(-)
ACK. Fixes the problems I identified yesterday.
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 72fc8aa..bfac307 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -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);
Ah, much nicer than my futile attempts at removing the 'static' modifier from the now-private functions. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
2010/12/17 Eric Blake <eblake@redhat.com>:
On 12/17/2010 08:59 AM, Matthias Bolte wrote:
--- tests/qemuargv2xmltest.c | 1 + tests/qemuhelptest.c | 5 +++-- tests/qemuxml2argvtest.c | 8 +++++--- tests/testutilsqemu.c | 6 ++---- 4 files changed, 11 insertions(+), 9 deletions(-)
ACK. Fixes the problems I identified yesterday.
Thanks, but Daniel fixed it in the meantime :)
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 72fc8aa..bfac307 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -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);
Ah, much nicer than my futile attempts at removing the 'static' modifier from the now-private functions.
At first I tried that too, until I noticed qemuDomainSetNamespaceHooks :) Matthias
participants (2)
-
Eric Blake -
Matthias Bolte