[libvirt] [PATCH 1/2] tests: Fake host capabilities properly

Serge E. Hallyn serge.hallyn at canonical.com
Tue Feb 15 15:59:57 UTC 2011


Quoting Jiri Denemark (jdenemar at redhat.com):
> Since we fake host CPU we should also fake host arch instead of taking
> the real architecture tests are running on.
> ---
>  tests/testutilsqemu.c |    8 +++++---
>  1 files changed, 5 insertions(+), 3 deletions(-)

Tested-by: Serge Hallyn <serge.hallyn at canonical.com>

Thanks, Jiri!

> 
> diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
> index bfac307..fbbb6c1 100644
> --- a/tests/testutilsqemu.c
> +++ b/tests/testutilsqemu.c
> @@ -95,7 +95,7 @@ virCapsPtr testQemuCapsInit(void) {
>      };
>  
>      uname (&utsname);
> -    if ((caps = virCapabilitiesNew(utsname.machine,
> +    if ((caps = virCapabilitiesNew(host_cpu.arch,
>                                     0, 0)) == NULL)
>          return NULL;
>  
> @@ -107,7 +107,8 @@ virCapsPtr testQemuCapsInit(void) {
>  
>      if ((guest = virCapabilitiesAddGuest(caps, "hvm", "i686", 32,
>                                           "/usr/bin/qemu", NULL,
> -                                         nmachines, machines)) == NULL)
> +                                         nmachines, machines)) == NULL ||
> +        !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
>          goto cleanup;
>      machines = NULL;
>  
> @@ -124,7 +125,8 @@ virCapsPtr testQemuCapsInit(void) {
>  
>      if ((guest = virCapabilitiesAddGuest(caps, "hvm", "x86_64", 64,
>                                           "/usr/bin/qemu-system-x86_64", NULL,
> -                                         nmachines, machines)) == NULL)
> +                                         nmachines, machines)) == NULL ||
> +        !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
>          goto cleanup;
>      machines = NULL;
>  
> -- 
> 1.7.4.1
> 
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list




More information about the libvir-list mailing list