[libvirt] [PATCH] Adapt test suite to code movement in the QEMU driver

[Matthias Bolte]

2010/12/17 Eric Blake <eblake at 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