drm/i915/gvt: merge gvt.c into kvmgvt.c

The code in both files is deeply interconnected, so merge it and
keep a bunch of structures and functions static.

Signed-off-by: Christoph Hellwig <[email protected]>
Signed-off-by: Zhi Wang <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Jason Gunthorpe <[email protected]>
Reviewed-by: Zhi Wang <[email protected]>

Author: Christoph Hellwig

drivers/gpu/drm/i915/gvt/Makefile

@@ -12,7 +12,6 @@ kvmgt-$(CONFIG_DRM_I915_GVT) += \
 	gvt/fb_decoder.o \
 	gvt/firmware.o \
 	gvt/gtt.o \
-	gvt/gvt.o \
 	gvt/handlers.o \
 	gvt/interrupt.o \
 	gvt/kvmgt.o \

drivers/gpu/drm/i915/gvt/gvt.c

@@ -765,12 +765,6 @@ int intel_gvt_dma_map_guest_page(struct intel_vgpu *vgpu, unsigned long gfn,
 void intel_gvt_dma_unmap_guest_page(struct intel_vgpu *vgpu,
 		dma_addr_t dma_addr);
 
-int intel_gvt_init_vgpu_type_groups(struct intel_gvt *gvt);
-void intel_gvt_cleanup_vgpu_type_groups(struct intel_gvt *gvt);
-
 #include "trace.h"
 
-extern const struct intel_vgpu_ops intel_gvt_vgpu_ops;
-extern const struct mdev_parent_ops intel_vgpu_mdev_ops;
-
 #endif