635c6af9fc
Note that there is a bug in 4.11 (also present in recent 4.6 and 4.8) which causes an infrequent assert failure when running NetBSD PV guests. The root cause has not been found, but a workaround is inclued which doesn't seems to have ill effects. See xenkernel411/patches/patch-zz-bouyer for details.
62 lines
1.6 KiB
C
62 lines
1.6 KiB
C
$NetBSD: patch-tools_qemu-xen-traditional_block-raw-posix.c,v 1.1 2018/07/24 13:40:11 bouyer Exp $
|
|
|
|
- if given a block device, use the character device instead.
|
|
|
|
--- tools/qemu-xen-traditional/block-raw-posix.c.orig 2014-10-06 17:50:24.000000000 +0200
|
|
+++ tools/qemu-xen-traditional/block-raw-posix.c 2015-01-19 13:16:38.000000000 +0100
|
|
@@ -65,6 +65,7 @@
|
|
#include <sys/disklabel.h>
|
|
#include <sys/dkio.h>
|
|
#include <sys/disk.h>
|
|
+#include <sys/param.h>
|
|
#endif
|
|
|
|
#ifdef __OpenBSD__
|
|
@@ -72,6 +73,13 @@
|
|
#include <sys/disklabel.h>
|
|
#include <sys/dkio.h>
|
|
#endif
|
|
+#if defined(__NetBSD__)
|
|
+#include <sys/ioctl.h>
|
|
+#include <sys/disklabel.h>
|
|
+#include <sys/dkio.h>
|
|
+#define SLIST_ENTRY(x) int /*XXXX !*/
|
|
+#include <sys/disk.h>
|
|
+#endif
|
|
|
|
//#define DEBUG_FLOPPY
|
|
|
|
@@ -1008,6 +1016,33 @@
|
|
{
|
|
BDRVRawState *s = bs->opaque;
|
|
int fd, open_flags, ret;
|
|
+#ifdef __NetBSD__
|
|
+ struct stat sb;
|
|
+ static char namebuf[MAXPATHLEN];
|
|
+ const char *dp;
|
|
+
|
|
+ if (lstat(filename, &sb) < 0) {
|
|
+ fprintf(stderr, "%s: stat failed: %s\n", filename, strerror(errno));
|
|
+ return -errno;
|
|
+ }
|
|
+ if (S_ISLNK(sb.st_mode)) {
|
|
+ fprintf(stderr, "%s: symolink links not supported by qemu-dm\n",
|
|
+ filename);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+ if (S_ISBLK(sb.st_mode)) {
|
|
+ dp = strrchr(filename, '/');
|
|
+ if (dp == NULL) {
|
|
+ snprintf(namebuf, MAXPATHLEN, "r%s", filename);
|
|
+ } else {
|
|
+ snprintf(namebuf, MAXPATHLEN, "%.*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);
|
|
+ }
|
|
+#endif
|
|
|
|
posix_aio_init();
|
|
|