[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] block/raw-posix: use a character device if a block
From: |
Christoph Egger |
Subject: |
[Qemu-devel] [PATCH] block/raw-posix: use a character device if a block device is given |
Date: |
Mon, 23 May 2011 14:34:10 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; NetBSD amd64; en-US; rv:1.9.2.13) Gecko/20110202 Lightning/1.0b3pre Thunderbird/3.1.7 |
if given a block device, use the character device instead.
From: Manuel Bouyer <address@hidden>
Signed-off-by: Christoph Egger <address@hidden>
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 6b72470..d05f373 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -136,11 +143,45 @@ static int64_t raw_getlength(BlockDriverState *bs);
static int cdrom_reopen(BlockDriverState *bs);
#endif
+#if defined(__NetBSD__)
+static const char *raw_get_rawdevice(const char *filename)
+{
+ static char namebuf[PATH_MAX];
+ const char *dp = strrchr(filename, '/');
+
+ if (dp == NULL) {
+ snprintf(namebuf, PATH_MAX, "r%s", filename);
+ } else {
+ snprintf(namebuf, PATH_MAX, "%.*s/r%s",
+ (int)(dp - filename), filename, dp + 1);
+ }
+ fprintf(stderr, "%s is a block device", filename);
+ filename = namebuf;
+ fprintf(stderr, ", using %s\n", filename);
+
+ return filename;
+}
+#else
+static const char *raw_get_rawdevice(const char *filename)
+{
+ return filename;
+}
+#endif
+
static int raw_open_common(BlockDriverState *bs, const char *filename,
int bdrv_flags, int open_flags)
{
BDRVRawState *s = bs->opaque;
int fd, ret;
+ struct stat sb;
+
+ if (lstat(filename, &sb) < 0) {
+ fprintf(stderr, "%s: stat failed: %s\n", filename,
strerror(errno));
+ return -errno;
+ }
+
+ if (S_ISBLK(sb.st_mode))
+ filename = raw_get_rawdevice(filename);
s->open_flags = open_flags | O_BINARY;
s->open_flags &= ~O_ACCMODE;
--
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
- [Qemu-devel] [PATCH] block/raw-posix: use a character device if a block device is given,
Christoph Egger <=