summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2008-09-16 13:21:58 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2008-09-16 13:21:58 +0000
commit2acf5af04daf02723a4ba1b720a53b6e718023f4 (patch)
treeb242abe1cd1a8f033fd11506b8b27b174e567327
parentde5c2d0a1fd1668fe38bf88706c099b24407b079 (diff)
downloadhqemu-2acf5af04daf02723a4ba1b720a53b6e718023f4.zip
hqemu-2acf5af04daf02723a4ba1b720a53b6e718023f4.tar.gz
block-raw is not a protocol
The protocol_name "file" was added to the block driver when async IO was introduced. This can be used to select that a file is treated as a raw device instead of probing for the type. However, protocols are not subject to path interpretation which cases qcow2 images with raw base images to not function is the path was specified relatively. The fix is simply to remove the protocol_name from the raw block driver. The proper way to force the use of a raw block format is to use the format= option with -drive. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5233 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--block-raw-posix.c1
-rw-r--r--block-raw-win32.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/block-raw-posix.c b/block-raw-posix.c
index 8339071..7c42c10 100644
--- a/block-raw-posix.c
+++ b/block-raw-posix.c
@@ -846,7 +846,6 @@ BlockDriver bdrv_raw = {
.bdrv_aio_cancel = raw_aio_cancel,
.aiocb_size = sizeof(RawAIOCB),
#endif
- .protocol_name = "file",
.bdrv_pread = raw_pread,
.bdrv_pwrite = raw_pwrite,
.bdrv_truncate = raw_truncate,
diff --git a/block-raw-win32.c b/block-raw-win32.c
index 2c3f88f..71404ac 100644
--- a/block-raw-win32.c
+++ b/block-raw-win32.c
@@ -369,7 +369,6 @@ BlockDriver bdrv_raw = {
.bdrv_aio_cancel = raw_aio_cancel,
.aiocb_size = sizeof(RawAIOCB);
#endif
- .protocol_name = "file",
.bdrv_pread = raw_pread,
.bdrv_pwrite = raw_pwrite,
.bdrv_truncate = raw_truncate,
OpenPOWER on IntegriCloud