Merge pull request #2054 from GabyCT/topic/addcli

configuration: Add QEMU with virtiofs 3.0 support

Makefile

@@ -119,15 +119,18 @@ HYPERVISOR_FC = firecracker
 JAILER_FC = jailer
 HYPERVISOR_NEMU = nemu
 HYPERVISOR_QEMU = qemu
+HYPERVISOR_QEMU_VIRTIOFS = qemu-virtiofs
 
 # Determines which hypervisor is specified in $(CONFIG_FILE).
 DEFAULT_HYPERVISOR = $(HYPERVISOR_QEMU)
 
 # List of hypervisors this build system can generate configuration for.
-HYPERVISORS := $(HYPERVISOR_ACRN) $(HYPERVISOR_FC) $(HYPERVISOR_QEMU) $(HYPERVISOR_NEMU)
+HYPERVISORS := $(HYPERVISOR_ACRN) $(HYPERVISOR_FC) $(HYPERVISOR_QEMU) $(HYPERVISOR_QEMU_VIRTIOFS) $(HYPERVISOR_NEMU)
 
 QEMUPATH := $(QEMUBINDIR)/$(QEMUCMD)
 
+QEMUVIRTIOFSPATH := $(QEMUBINDIR)/$(QEMUVIRTIOFSCMD)
+
 NEMUPATH := $(NEMUBINDIR)/$(NEMUCMD)
 
 FCPATH = $(FCBINDIR)/$(FCCMD)
@@ -237,6 +240,28 @@ ifneq (,$(QEMUCMD))
     KERNELPATH = $(KERNELDIR)/$(KERNELNAME)
 endif
 
+ifneq (,$(QEMUVIRTIOFSCMD))
+	KNOWN_HYPERVISORS += $(HYPERVISOR_QEMU_VIRTIOFS)
+
+ 	CONFIG_FILE_QEMU_VIRTIOFS = configuration-qemu-virtiofs.toml
+	CONFIG_QEMU_VIRTIOFS = $(CLI_DIR)/config/$(CONFIG_FILE_QEMU_VIRTIOFS)
+	CONFIG_QEMU_VIRTIOFS_IN = $(CONFIG_QEMU_VIRTIOFS).in
+
+	CONFIG_PATH_QEMU_VIRTIOFS = $(abspath $(CONFDIR)/$(CONFIG_FILE_QEMU_VIRTIOFS))
+	CONFIG_PATHS += $(CONFIG_PATH_QEMU_VIRTIOFS)
+
+	SYSCONFIG_QEMU_VIRTIOFS = $(abspath $(SYSCONFDIR)/$(CONFIG_FILE_QEMU_VIRTIOFS))
+	SYSCONFIG_PATHS += $(SYSCONFIG_QEMU_VIRTIOFS)
+
+	CONFIGS += $(CONFIG_QEMU_VIRTIOFS)
+
+	# qemu-specific options (all should be suffixed by "_QEMU")
+	DEFBLOCKSTORAGEDRIVER_QEMU_VIRTIOFS := virtio-fs
+	DEFNETWORKMODEL_QEMU := tcfilter
+	KERNELNAME = $(call MAKE_KERNEL_NAME,$(KERNELTYPE))
+	KERNELPATH = $(KERNELDIR)/$(KERNELNAME)
+endif
+
 ifneq (,$(NEMUCMD))
     KNOWN_HYPERVISORS += $(HYPERVISOR_NEMU)
 
@@ -325,6 +350,10 @@ ifeq ($(DEFAULT_HYPERVISOR),$(HYPERVISOR_QEMU))
     DEFAULT_HYPERVISOR_CONFIG = $(CONFIG_FILE_QEMU)
 endif
 
+ifeq ($(DEFAULT_HYPERVISOR),$(HYPERVISOR_QEMU_VIRTIOFS))
+    DEFAULT_HYPERVISOR_CONFIG = $(CONFIG_FILE_QEMU)
+endif
+
 ifeq ($(DEFAULT_HYPERVISOR),$(HYPERVISOR_FC))
     DEFAULT_HYPERVISOR_CONFIG = $(CONFIG_FILE_FC)
 endif
@@ -394,6 +423,8 @@ USER_VARS += NETMONPATH
 USER_VARS += QEMUBINDIR
 USER_VARS += QEMUCMD
 USER_VARS += QEMUPATH
+USER_VARS += QEMUVIRTIOFSCMD
+USER_VARS += QEMUVIRTIOFSPATH
 USER_VARS += SHAREDIR
 USER_VARS += SHIMPATH
 USER_VARS += SYSCONFDIR
@@ -412,6 +443,7 @@ USER_VARS += DEFDISABLEBLOCK
 USER_VARS += DEFBLOCKSTORAGEDRIVER_ACRN
 USER_VARS += DEFBLOCKSTORAGEDRIVER_FC
 USER_VARS += DEFBLOCKSTORAGEDRIVER_QEMU
+USER_VARS += DEFBLOCKSTORAGEDRIVER_QEMU_VIRTIOFS
 USER_VARS += DEFBLOCKSTORAGEDRIVER_NEMU
 USER_VARS += DEFSHAREDFS
 USER_VARS += DEFSHAREDFS_NEMU
@@ -551,6 +583,7 @@ $(GENERATED_FILES): %: %.in $(MAKEFILE_LIST) VERSION .git-commit
 		-e "s|@PROJECT_TAG@|$(PROJECT_TAG)|g" \
 		-e "s|@PROJECT_TYPE@|$(PROJECT_TYPE)|g" \
 		-e "s|@QEMUPATH@|$(QEMUPATH)|g" \
+		-e "s|@QEMUVIRTIOFSPATH@|$(QEMUVIRTIOFSPATH)|g" \
 		-e "s|@RUNTIME_NAME@|$(TARGET)|g" \
 		-e "s|@MACHINETYPE@|$(MACHINETYPE)|g" \
 		-e "s|@SHIMPATH@|$(SHIMPATH)|g" \
@@ -569,6 +602,7 @@ $(GENERATED_FILES): %: %.in $(MAKEFILE_LIST) VERSION .git-commit
 		-e "s|@DEFBLOCKSTORAGEDRIVER_ACRN@|$(DEFBLOCKSTORAGEDRIVER_ACRN)|g" \
 		-e "s|@DEFBLOCKSTORAGEDRIVER_FC@|$(DEFBLOCKSTORAGEDRIVER_FC)|g" \
 		-e "s|@DEFBLOCKSTORAGEDRIVER_QEMU@|$(DEFBLOCKSTORAGEDRIVER_QEMU)|g" \
+		-e "s|@DEFBLOCKSTORAGEDRIVER_QEMU_VIRTIOFS@|$(DEFBLOCKSTORAGEDRIVER_QEMU_VIRTIOFS)|g" \
 		-e "s|@DEFBLOCKSTORAGEDRIVER_NEMU@|$(DEFBLOCKSTORAGEDRIVER_NEMU)|g" \
 		-e "s|@DEFSHAREDFS@|$(DEFSHAREDFS)|g" \
 		-e "s|@DEFSHAREDFS_NEMU@|$(DEFSHAREDFS_NEMU)|g" \
@@ -731,6 +765,9 @@ endif
 ifneq (,$(findstring $(HYPERVISOR_QEMU),$(KNOWN_HYPERVISORS)))
 	@printf "\t$(HYPERVISOR_QEMU) hypervisor path (QEMUPATH) : %s\n" $(abspath $(QEMUPATH))
 endif
+ifneq (,$(findstring $(HYPERVISOR_QEMU_VIRTIOFS),$(KNOWN_HYPERVISORS)))
+	@printf "\t$(HYPERVISOR_QEMU_VIRTIOFS) hypervisor path (QEMUVIRTIOFSPATH) : %s\n" $(abspath $(QEMUVIRTIOFSPATH))
+endif
 ifneq (,$(findstring $(HYPERVISOR_NEMU),$(KNOWN_HYPERVISORS)))
 	@printf "\t$(HYPERVISOR_NEMU) hypervisor path (NEMUPATH) : %s\n" $(abspath $(NEMUPATH))
 endif

arch/amd64-options.mk

@@ -11,6 +11,9 @@ MACHINEACCELERATORS :=
 
 QEMUCMD := qemu-system-x86_64
 
+# Qemu experimental with virtiofs
+QEMUVIRTIOFSCMD := qemu-virtiofs-system-x86_64
+
 # Firecracker binary name
 FCCMD := firecracker
 # Firecracker's jailer binary name