From 06b92c661196ea5fd478ad7e9049576e8e0dc6e4 Mon Sep 17 00:00:00 2001 From: John Andersen Date: Tue, 27 Jun 2017 08:01:46 -0700 Subject: [PATCH] samples: net: Multiple instances of QEMU Makefiles which start QEMU (make run) have been changed to operate off of the QEMU_INSTANCE variable. QEMU_INSTANCE is simply appended to the pid and sock file names. This makes us able to run multiple QEMU Zephyr instances of the same sample. Signed-off-by: John Andersen --- samples/net/common/Makefile.ipstack | 2 +- scripts/Makefile.qemu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/net/common/Makefile.ipstack b/samples/net/common/Makefile.ipstack index 2baaaa877b2..81aef24de3c 100644 --- a/samples/net/common/Makefile.ipstack +++ b/samples/net/common/Makefile.ipstack @@ -18,7 +18,7 @@ ifdef QEMU_NUM QEMU_EXTRA_FLAGS += -serial none -serial pipe:${PIPE_BASE}-${QEMU_NUM} \ -pidfile qemu-${QEMU_NUM}.pid else - QEMU_EXTRA_FLAGS += -serial none -serial unix:/tmp/slip.sock + QEMU_EXTRA_FLAGS += -serial none -serial unix:/tmp/slip.sock$(QEMU_INSTANCE) endif PIPE_SERVER_IN=${PIPE_BASE}-server.in diff --git a/scripts/Makefile.qemu b/scripts/Makefile.qemu index 2e21807c2a4..b0bba796b34 100644 --- a/scripts/Makefile.qemu +++ b/scripts/Makefile.qemu @@ -6,7 +6,7 @@ # Abstraction of 'run' goal with Qemu -QEMU_FLAGS = $(QEMU_FLAGS_$(ARCH)) -pidfile qemu.pid +QEMU_FLAGS = $(QEMU_FLAGS_$(ARCH)) -pidfile qemu$(QEMU_INSTANCE).pid ifneq ($(QEMU_PTY),) QEMU_FLAGS += -serial pty