From: ths <ths>
Date: Thu, 18 Jan 2007 00:22:11 +0000 (+0000)
Subject: Fix CDROM permission check, by Kazu <kazoo@r3.dion.ne.jp>.
X-Git-Tag: release_0_9_1~1564
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6eeddeae9d8cdf570e6287db0548fcc0a0b5c665;p=qemu-xen-4.5-testing.git

Fix CDROM permission check, by Kazu <kazoo@r3.dion.ne.jp>.
---

diff --git a/block-raw.c b/block-raw.c
index 2b6f441ba..29882e1f7 100644
--- a/block-raw.c
+++ b/block-raw.c
@@ -914,8 +914,13 @@ static int raw_open(BlockDriverState *bs, const char *filename, int flags)
     s->hfile = CreateFile(filename, access_flags, 
                           FILE_SHARE_READ, NULL,
                           create_flags, overlapped, NULL);
-    if (s->hfile == INVALID_HANDLE_VALUE) 
+    if (s->hfile == INVALID_HANDLE_VALUE) {
+        int err = GetLastError();
+
+        if (err == ERROR_ACCESS_DENIED)
+            return -EACCES;
         return -1;
+    }
     return 0;
 }
 
@@ -1278,8 +1283,13 @@ static int hdev_open(BlockDriverState *bs, const char *filename, int flags)
     s->hfile = CreateFile(filename, access_flags, 
                           FILE_SHARE_READ, NULL,
                           create_flags, overlapped, NULL);
-    if (s->hfile == INVALID_HANDLE_VALUE) 
+    if (s->hfile == INVALID_HANDLE_VALUE) {
+        int err = GetLastError();
+
+        if (err == ERROR_ACCESS_DENIED)
+            return -EACCES;
         return -1;
+    }
     return 0;
 }