[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] Only probe for CPU models if required



On Mon, Dec 21, 2009 at 05:44:50PM +0100, Jiri Denemark wrote:
> CPU models where probe everytime a qemu command line was built. But it
> only makes sense to do so when a guest's XML contains CPU model.
> 
> Signed-off-by: Jiri Denemark <jdenemar redhat com>
> ---
>  src/qemu/qemu_conf.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
> index 36bf9a2..3f6c79b 100644
> --- a/src/qemu/qemu_conf.c
> +++ b/src/qemu/qemu_conf.c
> @@ -1778,17 +1778,18 @@ qemudBuildCommandLineCPU(virConnectPtr conn,
>  {
>      const virCPUDefPtr host = driver->caps->host.cpu;
>      virCPUDefPtr guest = NULL;
> -    unsigned int ncpus;
> +    unsigned int ncpus = 0;
>      const char **cpus = NULL;
>      union cpuData *data = NULL;
>      int ret = -1;
>      virBuffer buf = VIR_BUFFER_INITIALIZER;
>      int i;
>  
> -    if (qemudProbeCPUModels(emulator, ut->machine, &ncpus, &cpus) < 0)
> +    if (def->cpu && def->cpu->model
> +        && qemudProbeCPUModels(emulator, ut->machine, &ncpus, &cpus) < 0)
>          goto cleanup;
>  
> -    if (ncpus > 0 && host && def->cpu && def->cpu->model) {
> +    if (ncpus > 0 && host) {
>          virCPUCompareResult cmp;
>  
>          cmp = cpuGuestData(conn, host, def->cpu, &data);

ACK, this should fix the test suite failures seen where it tries to
run a QEMU binary when generating ARGV. Eventually we should move
the probe call init the code which generates the capabilities data
and keep the list of CPUs permanently.

Daniel
-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]