summaryrefslogtreecommitdiffstats
path: root/src/qemu
diff options
context:
space:
mode:
authorRadek Zetik <radekx.zetik@intel.com>2015-10-01 18:13:18 +0100
committerMaryam Tahhan <maryam.tahhan@intel.com>2015-10-07 14:52:16 +0000
commit1550b638fca662c5e68556702ff0316c3fc9562c (patch)
treeb1127cc75b45fd64b216070ed78b57e52db2c30e /src/qemu
parent46e36fffc36753b0e8e3f79f78dc084f26930a82 (diff)
The 'make' creates all required variants of vSwitch
Currently the VSPERF makefiles make just one variant of vSwitch - OVS with DPDK-vhost-user. To make the other variants the makefile has to be edited. And the make re-run. The fix builds all required versions: DPDK-vhost-user OVS (in src/) Vanilla OVS (in src_vanilla/) DPDK-vhost-cuse OVS (in src_cuse/) HowTo: - git clone vsperf - cd .../src - make JIRA: VSPERF-85 Change-Id: I469baf8432f0b127cde785f35a6c57a2c778f23f Signed-off-by: Radek Zetik <radekx.zetik@intel.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com> Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Diffstat (limited to 'src/qemu')
-rwxr-xr-xsrc/qemu/Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/qemu/Makefile b/src/qemu/Makefile
index 1a736a29..0a71cf78 100755
--- a/src/qemu/Makefile
+++ b/src/qemu/Makefile
@@ -27,7 +27,8 @@ TAG_DONE_FLAG = $(WORK_DIR)/.$(QEMU_TAG).done
CONFIG_CMD =
CONFIG_CMD += ./configure
CONFIG_CMD += --target-list="x86_64-softmmu"
-
+QEMU_VANILLA = ../../src_vanilla/qemu
+QEMU_CUSE = ../../src_cuse/qemu
all: force_make
@@ -56,6 +57,8 @@ install: $(INSTALL_TARGET)
clean:
clobber:
$(AT)rm -rf $(WORK_DIR)
+ $(AT)rm -rf $(QEMU_VANILLA)
+ $(AT)rm -rf $(QEMU_CUSE)
# cleanse is for developer who would like to keep the
# clone git repo, saving time to fetch again from url
@@ -72,6 +75,10 @@ $(WORK_DIR)/configure: $(TAG_DONE_FLAG)
$(WORK_DIR):
$(AT)git clone $(QEMU_URL)
+ $(AT)mkdir -p $(QEMU_VANILLA)
+ $(AT)cp -rf ./* $(QEMU_VANILLA)
+ $(AT)mkdir -p $(QEMU_CUSE)
+ $(AT)cp -rf ./* $(QEMU_CUSE)
$(TAG_DONE_FLAG): $(WORK_DIR)
$(AT)cd $(WORK_DIR); git checkout $(QEMU_TAG)