Re: [libvirt] [PATCH] qemu: fix typo in name - should be VHOST_NET, not VNET_HOST
On 05/23/2011 01:58 PM, Eric Blake wrote:
On 05/23/2011 11:43 AM, Laine Stump wrote:
> ---
> configure.ac | 8 +++++---
> src/qemu/qemu_capabilities.c | 2 +-
> src/qemu/qemu_capabilities.h | 2 +-
> src/qemu/qemu_command.c | 2 +-
> tests/qemuhelptest.c | 8 ++++----
> 5 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 80a13a1..b6f433b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -318,14 +318,16 @@ AC_ARG_WITH([init-script],
> [AC_HELP_STRING([--with-init-script=@<:@redhat|auto|none@:>@],
> [Style of init script to install @<:@default=auto@:>@])])
> if test "x$with_init_script" = "x" || test
"x$with_init_script" = "xauto"; then
> - if test "$cross_compiling" = yes || test ! -f /etc/redhat-release;
then
> + if test "$sysconfdir" != "/etc" || test
"$cross_compiling" = yes \
> + || test ! -f /etc/redhat-release; then
> with_init_script=none
> else
> with_init_script=redhat
> fi
> fi
> -AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_RED_HAT], test x$with_init_script = xredhat)
> -AC_MSG_RESULT($with_init_script)
> +AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_RED_HAT],
> + [test x$with_init_script = xredhat])
> +AC_MSG_RESULT([$with_init_script])
This file change is unrelated. Did you commit too much?
Yes. As I was "git add"ing files from my work directory, I was thinking
"I need to do everything except configure.ac", but I guess I was a bit
over zealous, and added that too.
(BTW, I hadn't yet posted that as a patch because when I tried building
with it, I seemed to not get the initscript in the build)
ACK to the rest of the patch, though. Does this interfere with the
work
to store qemu capabilities into xml?
I haven't paid attention to that work (who is doing it? are there
patches yet?), but if anything it should be just a simple merge conflict.
I won't push until I hear back what that is all about.