On Tue, Sep 25, 2012 at 01:43:30PM -0600, Eric Blake wrote:
On 09/25/2012 11:59 AM, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" <berrange(a)redhat.com>
>
> Introduce a qemuCapsCachePtr object to provide a global cache
> of capabilities for QEMU binaries. The cache auto-populates
> on first request for capabilities about a binary, and will
> auto-refresh if the binary has changed since a previous cache
> was populated
>
> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
> ---
> src/qemu/qemu_capabilities.c | 99 ++++++++++++++++++++++++++++++++++++++++++++
> src/qemu/qemu_capabilities.h | 9 ++++
> 2 files changed, 108 insertions(+)
>
> @@ -1940,6 +1945,10 @@ qemuCapsPtr qemuCapsNewForBinary(const char *binary)
> tmp = strstr(binary, QEMU_SYSTEM_PREFIX);
> if (tmp) {
> tmp += strlen(QEMU_SYSTEM_PREFIX);
> +
> + /* For historical compat we uses 'itanium' as arch name */
> + if (STREQ(tmp, "ia64"))
> + tmp = "itanium";
This hunk looks like it may have been rebased to the wrong patch, as
omitting it makes no difference to the new caching code.
Hmm, yes, it should have been included in a patch that was acked & pushed
previously. Will apply it separately as a dedicated fix now
ACK with that fixed.
Daniel
--
|:
http://berrange.com -o-
http://www.flickr.com/photos/dberrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|:
http://entangle-photo.org -o-
http://live.gnome.org/gtk-vnc :|