From 443e6577506825fb93cf752d91a4e97fcbaa885a Mon Sep 17 00:00:00 2001 From: Salvador Fuentes Date: Fri, 20 Sep 2019 15:17:42 -0500 Subject: [PATCH 1/3] config: honor DEFSHAREDFS_QEMU_VIRTIOFS and CONFIG_QEMU_VIRTIOFS_IN replace `DEFSHAREDFS_QEMU_VIRTIOFS` and `CONFIG_QEMU_VIRTIOFS_IN` with their values on the generated `configuration-qemu-virtiofs.toml` Fixes: #2079 Signed-off-by: Salvador Fuentes --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index f9b8437710..34d885c784 100644 --- a/Makefile +++ b/Makefile @@ -448,6 +448,7 @@ USER_VARS += DEFBLOCKSTORAGEDRIVER_QEMU_VIRTIOFS USER_VARS += DEFBLOCKSTORAGEDRIVER_NEMU USER_VARS += DEFSHAREDFS USER_VARS += DEFSHAREDFS_NEMU +USER_VARS += DEFSHAREDFS_QEMU_VIRTIOFS USER_VARS += DEFVIRTIOFSDAEMON USER_VARS += DEFVIRTIOFSCACHESIZE USER_VARS += DEFVIRTIOFSCACHE @@ -559,6 +560,7 @@ $(GENERATED_FILES): %: %.in $(MAKEFILE_LIST) VERSION .git-commit -e "s|@VERSION@|$(VERSION)|g" \ -e "s|@CONFIG_ACRN_IN@|$(CONFIG_ACRN_IN)|g" \ -e "s|@CONFIG_QEMU_IN@|$(CONFIG_QEMU_IN)|g" \ + -e "s|@CONFIG_QEMU_VIRTIOFS_IN@|$(CONFIG_QEMU_VIRTIOFS_IN)|g" \ -e "s|@CONFIG_NEMU_IN@|$(CONFIG_NEMU_IN)|g" \ -e "s|@CONFIG_FC_IN@|$(CONFIG_FC_IN)|g" \ -e "s|@CONFIG_PATH@|$(CONFIG_PATH)|g" \ @@ -613,6 +615,7 @@ $(GENERATED_FILES): %: %.in $(MAKEFILE_LIST) VERSION .git-commit -e "s|@DEFBLOCKSTORAGEDRIVER_NEMU@|$(DEFBLOCKSTORAGEDRIVER_NEMU)|g" \ -e "s|@DEFSHAREDFS@|$(DEFSHAREDFS)|g" \ -e "s|@DEFSHAREDFS_NEMU@|$(DEFSHAREDFS_NEMU)|g" \ + -e "s|@DEFSHAREDFS_QEMU_VIRTIOFS@|$(DEFSHAREDFS_QEMU_VIRTIOFS)|g" \ -e "s|@DEFVIRTIOFSDAEMON@|$(DEFVIRTIOFSDAEMON)|g" \ -e "s|@DEFVIRTIOFSCACHESIZE@|$(DEFVIRTIOFSCACHESIZE)|g" \ -e "s|@DEFVIRTIOFSCACHE@|$(DEFVIRTIOFSCACHE)|g" \ From 84ead984d2ebe24c47e92c0620fed9fff290ab65 Mon Sep 17 00:00:00 2001 From: Salvador Fuentes Date: Fri, 20 Sep 2019 15:30:00 -0500 Subject: [PATCH 2/3] config: add configuration-qemu-virtio-fs.toml to gitignore add generated configuration file to gitignore. Signed-off-by: Salvador Fuentes --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 303234395c..62465ece24 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ /cli/config/configuration-fc.toml /cli/config/configuration-nemu.toml /cli/config/configuration-qemu.toml +/cli/config/configuration-qemu-virtiofs.toml /cli/config-generated.go /cli/coverage.html /containerd-shim-kata-v2 From b1909e8ea20b4165d276d4ae8eec4a420579b59c Mon Sep 17 00:00:00 2001 From: Salvador Fuentes Date: Fri, 20 Sep 2019 15:33:50 -0500 Subject: [PATCH 3/3] config: fix virtiofsd name virtiofsd binary built using our packaging scripts is named `virtiofsd` and not `virtiofsd-x86_64` Signed-off-by: Salvador Fuentes --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 34d885c784..6004c8c2e9 100644 --- a/Makefile +++ b/Makefile @@ -174,7 +174,7 @@ DEFDISABLEBLOCK := false DEFSHAREDFS := virtio-9p DEFSHAREDFS_NEMU := virtio-9p DEFSHAREDFS_QEMU_VIRTIOFS := virtios-fs -DEFVIRTIOFSDAEMON := $(VIRTIOFSDBINDIR)/virtiofsd-x86_64 +DEFVIRTIOFSDAEMON := $(VIRTIOFSDBINDIR)/virtiofsd # Default DAX mapping cache size in MiB DEFVIRTIOFSCACHESIZE := 1024 DEFVIRTIOFSCACHE := always