From ff01b7b5addce6c452835d36b34249eb6add433d Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Tue, 21 May 2013 12:49:44 +0200 Subject: [PATCH] feature #1163: use image format as prefix for disks --- src/vmm_mad/exec/vmm_exec_xen4.conf | 2 +- src/vmm_mad/remotes/xen/xen4/attach_disk | 2 +- src/vmm_mad/remotes/xen/xen4/xenrc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vmm_mad/exec/vmm_exec_xen4.conf b/src/vmm_mad/exec/vmm_exec_xen4.conf index a8f882f552..d020ce35b6 100644 --- a/src/vmm_mad/exec/vmm_exec_xen4.conf +++ b/src/vmm_mad/exec/vmm_exec_xen4.conf @@ -28,6 +28,6 @@ #OS = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1", kernel_cmd="ro", hvm="yes" ] CREDIT = 256 -DISK = [ driver = "tap2:tapdisk:aio:" ] +DISK = [ driver = "raw:" ] #RAW = "data=\"on_crash=destroy\"" diff --git a/src/vmm_mad/remotes/xen/xen4/attach_disk b/src/vmm_mad/remotes/xen/xen4/attach_disk index 65f077c540..4549c34ace 100755 --- a/src/vmm_mad/remotes/xen/xen4/attach_disk +++ b/src/vmm_mad/remotes/xen/xen4/attach_disk @@ -47,7 +47,7 @@ READONLY="${XPATH_ELEMENTS[2]}" BUS="${XPATH_ELEMENTS[3]}" CACHE="${XPATH_ELEMENTS[4]}" -DEFAULT_FILE_PREFIX="file" +DEFAULT_FILE_PREFIX="raw" if [ -n "$IMAGE_PREFIX" ]; then DEFAULT_FILE_PREFIX="$IMAGE_PREFIX" diff --git a/src/vmm_mad/remotes/xen/xen4/xenrc b/src/vmm_mad/remotes/xen/xen4/xenrc index 940b8b72ca..c1f6daad1b 100644 --- a/src/vmm_mad/remotes/xen/xen4/xenrc +++ b/src/vmm_mad/remotes/xen/xen4/xenrc @@ -41,7 +41,7 @@ export XM_CREDITS="sudo $XM_PATH sched-credit" # Xen 4 uses the new blktap2 and tap:aio handler is no longer supported. # To make it work uncomment this line. This will be used as the default # handler for disk hot plug -export IMAGE_PREFIX="tap2:tapdisk:aio" +export IMAGE_PREFIX="raw" # Seconds to wait after shutdown until timeout export SHUTDOWN_TIMEOUT=300