diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-05-22 22:32:53 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-05-22 23:24:13 +0200 |
| commit | f19c6e5fe79c8bbd3c9ea25cd0380681bd99ce13 (patch) | |
| tree | 39fd8a06221d3e86a8105bac61f71b2cdaaac9cf | |
| parent | c4a74364b9ddb5c34bce788d453f93aa307731dd (diff) | |
vm: Use a para-virtualized disk when creating an image.
* guix/build/vm.scm (load-in-linux-vm): When MAKE-DISK-IMAGE?, use
'-drive ...,if=virtio' for better performance.
* gnu/system/vm.scm (qemu-image): Use /dev/vda instead of /dev/sda.
| -rw-r--r-- | gnu/system/vm.scm | 2 | ||||
| -rw-r--r-- | guix/build/vm.scm | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 39ce5bb6ef4..7d0ffd971ee 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm | |||
| @@ -236,7 +236,7 @@ the image." | |||
| 236 | (let ((graphs '#$(match inputs | 236 | (let ((graphs '#$(match inputs |
| 237 | (((names . _) ...) | 237 | (((names . _) ...) |
| 238 | names)))) | 238 | names)))) |
| 239 | (initialize-hard-disk "/dev/sda" | 239 | (initialize-hard-disk "/dev/vda" |
| 240 | #:grub.cfg #$grub-configuration | 240 | #:grub.cfg #$grub-configuration |
| 241 | #:closures graphs | 241 | #:closures graphs |
| 242 | #:copy-closures? #$copy-inputs? | 242 | #:copy-closures? #$copy-inputs? |
diff --git a/guix/build/vm.scm b/guix/build/vm.scm index 4de536abb45..e559542f0a3 100644 --- a/guix/build/vm.scm +++ b/guix/build/vm.scm | |||
| @@ -96,7 +96,8 @@ the #:references-graphs parameter of 'derivation'." | |||
| 96 | "-append" (string-append "console=ttyS0 --load=" | 96 | "-append" (string-append "console=ttyS0 --load=" |
| 97 | builder) | 97 | builder) |
| 98 | (if make-disk-image? | 98 | (if make-disk-image? |
| 99 | `("-hda" ,image-file) | 99 | `("-drive" ,(string-append "file=" image-file |
| 100 | ",if=virtio")) | ||
| 100 | '()))) | 101 | '()))) |
| 101 | (error "qemu failed" qemu)) | 102 | (error "qemu failed" qemu)) |
| 102 | 103 | ||
