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

Re: [libvirt] [PATCH v3 04/20] Remove probing of machine types when canonicalizing XML



On 09/25/2012 11:59 AM, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" <berrange redhat com>
> 
> When XML for a new guest is received, the machine type is
> immediately canonicalized into the version specific name.
> This involves probing QEMU for supported machine types.
> Replace this probing with a lookup of the machine types
> in the (hopefully cached) qemuCapsPtr object
> 
> Signed-off-by: Daniel P. Berrange <berrange redhat com>
> ---
>  src/qemu/qemu_command.h  |   3 --
>  src/qemu/qemu_driver.c   | 133 ++++++++---------------------------------------
>  tests/qemuxml2argvtest.c |  12 ++++-
>  tests/qemuxmlnstest.c    |   3 --
>  4 files changed, 33 insertions(+), 118 deletions(-)

Again, a nice cleanup. ACK

> @@ -157,6 +161,10 @@ static int testCompareXMLToArgvFiles(const char *xml,
>      VIR_FREE(log);
>      virResetLastError();
>  
> +    /* We do not call qemuCapsExtractVersionInfo() before calling
> +     * qemuBuildCommandLine(), so we should set QEMU_CAPS_PCI_MULTIBUS for
> +     * x86_64 and i686 architectures here.
> +     */
>      if (STREQLEN(vmdef->os.arch, "x86_64", 6) ||
>          STREQLEN(vmdef->os.arch, "i686", 4)) {
>          qemuCapsSet(extraFlags, QEMU_CAPS_PCI_MULTIBUS);

You've got some churn; this comment was just removed in 3/20.  Did you
rebase wrong?

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature


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