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 <[email protected]>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5233 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/block-raw-posix.c b/block-raw-posix.c
index 833907186ade91acc8adace2eac7c2371fbe156e..7c42c108e7b7a882720c658cdf28843b2e82164d 100644 (file)
--- 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 2c3f88f0514fb6b7c7672bde239fffea36666030..71404acb58ce00264c2c06404fbc6fd7dcf89d4c 100644 (file)
--- 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,