Re: [Qemu-devel] [PATCH v2 2/2] Add configure option --enable-pc-1-0-qemu-kvm

["Michael S. Tsirkin" <mst@redhat.com>]

On Fri, Aug 01, 2014 at 08:12:13PM +0100, Alex Bligh wrote:
> Add a configure option --enable-pc-1-0-qemu-kvm and the
> corresponding --disable-pc-1-0-qemu-kvm, defaulting
> to disabled.
> 
> Rename machine type pc-1.0 to pc-1.0-qemu-git.
> 
> Make pc-1.0 machine type an alias of either pc-1.0-qemu-kvm
> or pc-1.0-qemu-git depending on the value of the config
> option.
> 
> Signed-off-by: Alex Bligh <alex@alex.org.uk>

Nah that's too messy.
qemu-kvm should have used a different machine type,
it didn't but we should not perpetuate this mistake.
Please add a work around for this in management.

> ---
>  configure         |   12 ++++++++++++
>  hw/i386/pc_piix.c |    8 +++++++-
>  2 files changed, 19 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index f7685b5..b143302 100755
> --- a/configure
> +++ b/configure
> @@ -335,6 +335,7 @@ libssh2=""
>  vhdx=""
>  quorum=""
>  numa=""
> +pc_1_0_qemu_kvm="no"
>  
>  # parse CC options first
>  for opt do
> @@ -1125,6 +1126,10 @@ for opt do
>    ;;
>    --enable-numa) numa="yes"
>    ;;
> +  --disable-pc-1-0-qemu-kvm) pc_1_0_qemu_kvm="no"
> +  ;;
> +  --enable-pc-1-0-qemu-kvm) pc_1_0_qemu_kvm="yes"
> +  ;;
>    *)
>        echo "ERROR: unknown option $opt"
>        echo "Try '$0 --help' for more information"
> @@ -1394,6 +1399,8 @@ Advanced options (experts only):
>    --enable-quorum          enable quorum block filter support
>    --disable-numa           disable libnuma support
>    --enable-numa            enable libnuma support
> +  --disable-pc-1-0-qemu-kvm disable pc-1.0 machine type reflecting qemu-kvm
> +  --enable-pc-1-0-qemu-kvm enable pc-1.0 machine type reflecting qemu-kvm
>  
>  NOTE: The object files are built at the place where configure is launched
>  EOF
> @@ -4262,6 +4269,7 @@ echo "Quorum            $quorum"
>  echo "lzo support       $lzo"
>  echo "snappy support    $snappy"
>  echo "NUMA host support $numa"
> +echo "pc-1.0 qemu-kvm   $pc_1_0_qemu_kvm"
>  
>  if test "$sdl_too_old" = "yes"; then
>  echo "-> Your SDL version is too old - please upgrade to have SDL support"
> @@ -5241,6 +5249,10 @@ if test "$numa" = "yes"; then
>    echo "CONFIG_NUMA=y" >> $config_host_mak
>  fi
>  
> +if test "$pc_1_0_qemu_kvm" = "yes"; then
> +  echo "CONFIG_PC_1_0_QEMU_KVM=y" >> $config_host_mak
> +fi
> +
>  # build tree in object directory in case the source is not in the current directory
>  DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests"
>  DIRS="$DIRS fsdev"
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index e400ea6..7a3db34 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -647,7 +647,10 @@ static QEMUMachine pc_machine_v1_1 = {
>  
>  static QEMUMachine pc_machine_v1_0 = {
>      PC_I440FX_1_2_MACHINE_OPTIONS,
> -    .name = "pc-1.0",
> +    .name = "pc-1.0-qemu-git",
> +#ifndef CONFIG_PC_1_0_QEMU_KVM
> +    .alias = "pc-1.0",
> +#endif
>      .compat_props = (GlobalProperty[]) {
>          PC_COMPAT_1_0,
>          { /* end of list */ }
> @@ -666,6 +669,9 @@ static QEMUMachine pc_machine_v1_0 = {
>  static QEMUMachine pc_machine_v1_0_qemu_kvm = {
>      PC_I440FX_1_2_MACHINE_OPTIONS,
>      .name = "pc-1.0-qemu-kvm",
> +#ifdef CONFIG_PC_1_0_QEMU_KVM
> +    .alias = "pc-1.0",
> +#endif
>      .init = pc_init_pci_1_2_qemu_kvm,
>      .compat_props = (GlobalProperty[]) {
>          PC_COMPAT_1_0_QEMU_KVM,
> -- 
> 1.7.9.5