1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH v2] tests/vm: move images to $HOME/.cache/qemu-vm/images

Gerd Hoffmann posted 1 patch 6 years, 9 months ago
Test docker-clang@ubuntu passed
Test docker-mingw@fedora passed
Test asan passed
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190124115448.30487-1-kraxel@redhat.com
Maintainers: "Philippe Mathieu-Daudé" <philmd@redhat.com>, Fam Zheng <fam@euphon.net>, "Alex Bennée" <alex.bennee@linaro.org>
tests/vm/Makefile.include | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
[Qemu-devel] [PATCH v2] tests/vm: move images to $HOME/.cache/qemu-vm/images
Posted by Gerd Hoffmann 6 years, 9 months ago 
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
Re: [Qemu-devel] [PATCH v2] tests/vm: move images to $HOME/.cache/qemu-vm/images
Posted by Philippe Mathieu-Daudé 6 years, 9 months ago 
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>
Re: [Qemu-devel] [PATCH v2] tests/vm: move images to $HOME/.cache/qemu-vm/images
Posted by Alex Bennée 6 years, 9 months ago 
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

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.