summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorChristoph Egger <Christoph.Egger@amd.com>2011-05-24 11:30:29 +0200
committerKevin Wolf <kwolf@redhat.com>2011-06-08 10:39:32 +0200
commit1de1ae0a7d956b3c87712bf2c09d277f99873f4c (patch)
tree54e38c273622a758fa333ec9d465867eeef0217c /block
parent16372ff03d71c7ed3283f0e873ea0727a35810a9 (diff)
downloadqemu-1de1ae0a7d956b3c87712bf2c09d277f99873f4c.tar.gz
block/raw-posix: use a character device if a block device is given
On NetBSD a userland process is better with the character device interface. In addition, a block device can't be opened twice; if a Xen backend opens it, qemu can't and vice-versa. Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/raw-posix.c43
1 files changed, 43 insertions, 0 deletions
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 50428fdbb5..00ed580a1f 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -136,12 +136,55 @@ static int64_t raw_getlength(BlockDriverState *bs);
static int cdrom_reopen(BlockDriverState *bs);
#endif
+#if defined(__NetBSD__)
+static int raw_normalize_devicepath(const char **filename)
+{
+ static char namebuf[PATH_MAX];
+ const char *dp, *fname;
+ struct stat sb;
+
+ fname = *filename;
+ dp = strrchr(fname, '/');
+ if (lstat(fname, &sb) < 0) {
+ fprintf(stderr, "%s: stat failed: %s\n",
+ fname, strerror(errno));
+ return -errno;
+ }
+
+ if (!S_ISBLK(sb.st_mode)) {
+ return 0;
+ }
+
+ if (dp == NULL) {
+ snprintf(namebuf, PATH_MAX, "r%s", fname);
+ } else {
+ snprintf(namebuf, PATH_MAX, "%.*s/r%s",
+ (int)(dp - fname), fname, dp + 1);
+ }
+ fprintf(stderr, "%s is a block device", fname);
+ *filename = namebuf;
+ fprintf(stderr, ", using %s\n", *filename);
+
+ return 0;
+}
+#else
+static int raw_normalize_devicepath(const char **filename)
+{
+ return 0;
+}
+#endif
+
static int raw_open_common(BlockDriverState *bs, const char *filename,
int bdrv_flags, int open_flags)
{
BDRVRawState *s = bs->opaque;
int fd, ret;
+ ret = raw_normalize_devicepath(&filename);
+ if (ret != 0) {
+ return ret;
+ }
+
s->open_flags = open_flags | O_BINARY;
s->open_flags &= ~O_ACCMODE;
if (bdrv_flags & BDRV_O_RDWR) {