Attachment 144662 Details for Bug 164630 – Backport of r256423 to 9 by Mark Felder

[patch] Backport of r256423 to 9 by Mark Felder

freebsd9-xen-cdrom-fix.patch (text/plain), 1.44 KB, created by Adam McDougall on 2014-07-14 17:28:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam McDougall

Created: 2014-07-14 17:28:46 UTC

Size: 1.44 KB

patch

obsolete

>--- sys/dev/xen/blkfront/blkfront.c.orig	2013-10-14 08:55:18.000000000 -0500
>+++ sys/dev/xen/blkfront/blkfront.c	2013-10-14 09:48:47.000000000 -0500
>@@ -399,14 +399,42 @@
> static int
> blkfront_probe(device_t dev)
> {
>+	if (strcmp(xenbus_get_type(dev), "vbd") != 0)
>+		return (ENXIO);
> 
>-	if (!strcmp(xenbus_get_type(dev), "vbd")) {
>-		device_set_desc(dev, "Virtual Block Device");
>-		device_quiet(dev);
>-		return (0);
>-	}
>+	#ifdef XENHVM
>+		int error;
>+		char *type;
>+
>+		/*
>+		 * When running in an HVM domain, IDE disk emulation is
>+		 * disabled early in boot so that native drivers will
>+		 * not see emulated hardware.  However, CDROM device
>+		 * emulation cannot be disabled.
>+		 *
>+		 * Through use of FreeBSD's vm_guest and xen_hvm_domain()
>+		 * APIs, we could modify the native CDROM driver to fail its
>+		 * probe when running under Xen.  Unfortunatlely, the PV
>+		 * CDROM support in XenServer (up through at least version
>+		 * 6.2) isn't functional, so we instead rely on the emulated
>+		 * CDROM instance, and fail to attach the PV one here in
>+		 * the blkfront driver.
>+		 */
>+		error = xs_read(XST_NIL, xenbus_get_node(dev),
>+		    "device-type", NULL, (void **) &type);
>+		if (error)
>+			return (ENXIO);
>+
>+		if (strncmp(type, "cdrom", 5) == 0) {
>+			free(type, M_XENSTORE);
>+			return (ENXIO);
>+		}
>+		free(type, M_XENSTORE);
>+	#endif
> 
>-	return (ENXIO);
>+	device_set_desc(dev, "Virtual Block Device");
>+	device_quiet(dev);
>+	return (0);
> }
> 
> static void

Actions: View | Diff

Attachments on bug 164630: 144662