Re: [Qemu-devel] [PATCH 3/3] vfio: Enable vfio-pci and mark supported

[Jan Kiszka]

On 2012-08-01 07:18, Alex Williamson wrote:
> Signed-off-by: Alex Williamson <address@hidden>
> ---
> 
>  MAINTAINERS           |    5 +++++
>  configure             |   12 ++++++++++++
>  hw/i386/Makefile.objs |    1 +
>  3 files changed, 18 insertions(+)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 2d219d2..9680d69 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -460,6 +460,11 @@ M: Gerd Hoffmann <address@hidden>
>  S: Maintained
>  F: hw/usb*
>  
> +VFIO
> +M: Alex Williamson <address@hidden>
> +S: Supported
> +F: hw/vfio*
> +
>  vhost
>  M: Michael S. Tsirkin <address@hidden>
>  S: Supported
> diff --git a/configure b/configure
> index c65b5f6..81108dc 100755
> --- a/configure
> +++ b/configure
> @@ -143,6 +143,7 @@ attr=""
>  libattr=""
>  xfs=""
>  
> +vfio_pci="no"
>  vhost_net="no"
>  kvm="no"
>  gprof="no"
> @@ -489,6 +490,7 @@ Haiku)
>    usb="linux"
>    kvm="yes"
>    vhost_net="yes"
> +  vfio_pci="yes"
>    if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
>      audio_possible_drivers="$audio_possible_drivers fmod"
>    fi
> @@ -824,6 +826,10 @@ for opt do
>    ;;
>    --disable-guest-agent) guest_agent="no"
>    ;;
> +  --disable-vfio-pci) vfio_pci="no"
> +  ;;
> +  --enable-vfio-pci) vfio_pci="yes"
> +  ;;

Do we need this level of control? Open question I'm just wondering every
time a new feature gets added together with --disable/--enable switches.

>    *) echo "ERROR: unknown option $opt"; show_help="yes"
>    ;;
>    esac
> @@ -1112,6 +1118,8 @@ echo "  --disable-guest-agent    disable building of 
> the QEMU Guest Agent"
>  echo "  --enable-guest-agent     enable building of the QEMU Guest Agent"
>  echo "  --with-coroutine=BACKEND coroutine backend. Supported options:"
>  echo "                           gthread, ucontext, sigaltstack, windows"
> +echo "  --disable-vfio-pci       disable vfio pci device assignement support"
> +echo "  --enable-vfio-pci        enable vfio pci device assignment support"
>  echo ""
>  echo "NOTE: The object files are built at the place where configure is 
> launched"
>  exit 1
> @@ -3072,6 +3080,7 @@ echo "OpenGL support    $opengl"
>  echo "libiscsi support  $libiscsi"
>  echo "build guest agent $guest_agent"
>  echo "coroutine backend $coroutine_backend"
> +echo "VFIO PCI support  $vfio_pci"
>  
>  if test "$sdl_too_old" = "yes"; then
>  echo "-> Your SDL version is too old - please upgrade to have SDL support"
> @@ -3754,6 +3763,9 @@ case "$target_arch2" in
>    *)
>      echo "CONFIG_NO_XEN=y" >> $config_target_mak
>  esac
> +if test "$vfio_pci" = "yes" -a "$target_softmmu" = "yes" ; then
> +  echo "CONFIG_VFIO_PCI=y" >> $config_target_mak
> +fi

Does this already somehow depend on host == Linux? If not, you may break
the others.

>  case "$target_arch2" in
>    i386|x86_64|ppcemb|ppc|ppc64|s390x)
>      # Make sure the target and host cpus are compatible
> diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
> index 8c764bb..a2783ef 100644
> --- a/hw/i386/Makefile.objs
> +++ b/hw/i386/Makefile.objs
> @@ -11,5 +11,6 @@ obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o
>  obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o 
> xen_pt_msi.o
>  obj-y += kvm/
>  obj-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o
> +obj-$(CONFIG_VFIO_PCI) += vfio_pci.o
>  
>  obj-y := $(addprefix ../,$(obj-y))
> 

Jan

signature.asc
Description: OpenPGP digital signature