* [Qemu-devel] [PATCH v2] tests/vm: move images to $HOME/.cache/qemu-vm/images
@ 2019-01-24 11:54 Gerd Hoffmann
2019-01-24 16:15 ` Philippe Mathieu-Daudé
2019-01-25 6:48 ` Alex Bennée
0 siblings, 2 replies; 3+ messages in thread
From: Gerd Hoffmann @ 2019-01-24 11:54 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Alex Bennée, Fam Zheng, Gerd Hoffmann
It's easier to move around the images then, by replacing the
subdirectory with a symlink. Allows to share the images between
multiple qemu checkouts for example.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
Notes:
v2: use $HOME/.cache/qemu-vm/images as location
tests/vm/Makefile.include | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index a98fb3027f..a58383d263 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -3,7 +3,8 @@
.PHONY: vm-build-all vm-clean-all
IMAGES := ubuntu.i386 freebsd netbsd openbsd centos
-IMAGE_FILES := $(patsubst %, tests/vm/%.img, $(IMAGES))
+IMAGES_DIR := $(HOME)/.cache/qemu-vm/images
+IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
.PRECIOUS: $(IMAGE_FILES)
@@ -24,9 +25,10 @@ vm-build-all: $(addprefix vm-build-, $(IMAGES))
vm-clean-all:
rm -f $(IMAGE_FILES)
-tests/vm/%.img: $(SRC_PATH)/tests/vm/% \
- $(SRC_PATH)/tests/vm/basevm.py \
- $(SRC_PATH)/tests/vm/Makefile.include
+$(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \
+ $(SRC_PATH)/tests/vm/basevm.py \
+ $(SRC_PATH)/tests/vm/Makefile.include
+ @mkdir -p $(IMAGES_DIR)
$(call quiet-command, \
$< \
$(if $(V)$(DEBUG), --debug) \
@@ -37,7 +39,7 @@ tests/vm/%.img: $(SRC_PATH)/tests/vm/% \
# Build in VM $(IMAGE)
-vm-build-%: tests/vm/%.img
+vm-build-%: $(IMAGES_DIR)/%.img
$(call quiet-command, \
$(SRC_PATH)/tests/vm/$* \
$(if $(V)$(DEBUG), --debug) \
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH v2] tests/vm: move images to $HOME/.cache/qemu-vm/images
2019-01-24 11:54 [Qemu-devel] [PATCH v2] tests/vm: move images to $HOME/.cache/qemu-vm/images Gerd Hoffmann
@ 2019-01-24 16:15 ` Philippe Mathieu-Daudé
2019-01-25 6:48 ` Alex Bennée
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-24 16:15 UTC (permalink / raw)
To: Gerd Hoffmann, qemu-devel; +Cc: Alex Bennée, Fam Zheng
On 1/24/19 12:54 PM, Gerd Hoffmann wrote:
> It's easier to move around the images then, by replacing the
> subdirectory with a symlink. Allows to share the images between
> multiple qemu checkouts for example.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>
> Notes:
> v2: use $HOME/.cache/qemu-vm/images as location
Thanks :)
>
> tests/vm/Makefile.include | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
> index a98fb3027f..a58383d263 100644
> --- a/tests/vm/Makefile.include
> +++ b/tests/vm/Makefile.include
> @@ -3,7 +3,8 @@
> .PHONY: vm-build-all vm-clean-all
>
> IMAGES := ubuntu.i386 freebsd netbsd openbsd centos
> -IMAGE_FILES := $(patsubst %, tests/vm/%.img, $(IMAGES))
> +IMAGES_DIR := $(HOME)/.cache/qemu-vm/images
> +IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
>
> .PRECIOUS: $(IMAGE_FILES)
>
> @@ -24,9 +25,10 @@ vm-build-all: $(addprefix vm-build-, $(IMAGES))
> vm-clean-all:
> rm -f $(IMAGE_FILES)
>
> -tests/vm/%.img: $(SRC_PATH)/tests/vm/% \
> - $(SRC_PATH)/tests/vm/basevm.py \
> - $(SRC_PATH)/tests/vm/Makefile.include
> +$(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \
> + $(SRC_PATH)/tests/vm/basevm.py \
> + $(SRC_PATH)/tests/vm/Makefile.include
> + @mkdir -p $(IMAGES_DIR)
> $(call quiet-command, \
> $< \
> $(if $(V)$(DEBUG), --debug) \
> @@ -37,7 +39,7 @@ tests/vm/%.img: $(SRC_PATH)/tests/vm/% \
>
>
> # Build in VM $(IMAGE)
> -vm-build-%: tests/vm/%.img
> +vm-build-%: $(IMAGES_DIR)/%.img
> $(call quiet-command, \
> $(SRC_PATH)/tests/vm/$* \
> $(if $(V)$(DEBUG), --debug) \
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH v2] tests/vm: move images to $HOME/.cache/qemu-vm/images
2019-01-24 11:54 [Qemu-devel] [PATCH v2] tests/vm: move images to $HOME/.cache/qemu-vm/images Gerd Hoffmann
2019-01-24 16:15 ` Philippe Mathieu-Daudé
@ 2019-01-25 6:48 ` Alex Bennée
1 sibling, 0 replies; 3+ messages in thread
From: Alex Bennée @ 2019-01-25 6:48 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: qemu-devel, Philippe Mathieu-Daudé, Fam Zheng
Gerd Hoffmann <kraxel@redhat.com> writes:
> It's easier to move around the images then, by replacing the
> subdirectory with a symlink. Allows to share the images between
> multiple qemu checkouts for example.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Queued to testing/next, thanks.
> ---
>
> Notes:
> v2: use $HOME/.cache/qemu-vm/images as location
>
> tests/vm/Makefile.include | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
> index a98fb3027f..a58383d263 100644
> --- a/tests/vm/Makefile.include
> +++ b/tests/vm/Makefile.include
> @@ -3,7 +3,8 @@
> .PHONY: vm-build-all vm-clean-all
>
> IMAGES := ubuntu.i386 freebsd netbsd openbsd centos
> -IMAGE_FILES := $(patsubst %, tests/vm/%.img, $(IMAGES))
> +IMAGES_DIR := $(HOME)/.cache/qemu-vm/images
> +IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
>
> .PRECIOUS: $(IMAGE_FILES)
>
> @@ -24,9 +25,10 @@ vm-build-all: $(addprefix vm-build-, $(IMAGES))
> vm-clean-all:
> rm -f $(IMAGE_FILES)
>
> -tests/vm/%.img: $(SRC_PATH)/tests/vm/% \
> - $(SRC_PATH)/tests/vm/basevm.py \
> - $(SRC_PATH)/tests/vm/Makefile.include
> +$(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \
> + $(SRC_PATH)/tests/vm/basevm.py \
> + $(SRC_PATH)/tests/vm/Makefile.include
> + @mkdir -p $(IMAGES_DIR)
> $(call quiet-command, \
> $< \
> $(if $(V)$(DEBUG), --debug) \
> @@ -37,7 +39,7 @@ tests/vm/%.img: $(SRC_PATH)/tests/vm/% \
>
>
> # Build in VM $(IMAGE)
> -vm-build-%: tests/vm/%.img
> +vm-build-%: $(IMAGES_DIR)/%.img
> $(call quiet-command, \
> $(SRC_PATH)/tests/vm/$* \
> $(if $(V)$(DEBUG), --debug) \
--
Alex Bennée
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-25 7:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-24 11:54 [Qemu-devel] [PATCH v2] tests/vm: move images to $HOME/.cache/qemu-vm/images Gerd Hoffmann
2019-01-24 16:15 ` Philippe Mathieu-Daudé
2019-01-25 6:48 ` Alex Bennée
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.