From: "Ross Maxfield" Subject: [PATCH] Missing CDROM media Date: Mon, 10 Apr 2006 09:57:35 -0600 Message-ID: <443A2AA0.DD28.00D3.0@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartE9CC9A7F.0__=" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --=__PartE9CC9A7F.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline If the 'cdrom=3D' option is specified in the definition file but media is = not found in the CD drive then main() in vl.c exits and the guest appears = to hang. This patch modifies vl.c slightly to check for the presents of = media. If the cdrom cannot be opened then the cd entry is removed from = hd_filename[] and bs_table[] allowing the guest to continue initializing. = If the guest requires the CD media then the guest should report, gracefully= or otherwise, that it's missing. I would like to see this patch applied to 3.0.2-testing as well. Thanks, Ross --=__PartE9CC9A7F.0__= Content-Type: application/octet-stream; name="missing_media.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="missing_media.patch" ZGlmZiAtciA0ZWQyNjlhYzdkODQgdG9vbHMvaW9lbXUvdmwuYwotLS0gYS90b29scy9pb2VtdS92 bC5jCU1vbiBBcHIgMTAgMTM6MjQ6NTggMjAwNiArMDEwMAorKysgYi90b29scy9pb2VtdS92bC5j CU1vbiBBcHIgMTAgMDk6NDk6MzYgMjAwNiAtMDYwMApAQCAtMzI0NSw4ICszMjQ1LDE3IEBAIGlu dCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAvKiB3ZSBhbHdheXMgY3JlYXRlIHRo ZSBjZHJvbSBkcml2ZSwgZXZlbiBpZiBubyBkaXNrIGlzIHRoZXJlICovCiAgICAgYmRydl9pbml0 KCk7CiAgICAgaWYgKGhhc19jZHJvbSkgewotICAgICAgICBic190YWJsZVsyXSA9IGJkcnZfbmV3 KCJjZHJvbSIpOwotICAgICAgICBiZHJ2X3NldF90eXBlX2hpbnQoYnNfdGFibGVbMl0sIEJEUlZf VFlQRV9DRFJPTSk7CisgICAgICAgIGludCBmZDsKKyAgICAgICAgaWYgKCAoZmQgPSBvcGVuKGhk X2ZpbGVuYW1lWzJdLCBPX1JET05MWSB8IE9fQklOQVJZKSkgPCAwKSB7CisgICAgICAgICAgICAg ICAgaGRfZmlsZW5hbWVbMl09TlVMTDsKKyAgICAgICAgICAgICAgICBic190YWJsZVsyXT1OVUxM OworICAgICAgICAgICAgICAgIGZwcmludGYobG9nZmlsZSwgIkNvdWxkIG5vdCBvcGVuIENEICVz LlxuIiwgaGRfZmlsZW5hbWVbaV0pOworICAgICAgICB9CisgICAgICAgIGVsc2UgeworICAgICAg ICAgICAgICAgIGNsb3NlKGZkKTsKKyAgICAgICAgICAgICAgICBic190YWJsZVsyXSA9IGJkcnZf bmV3KCJjZHJvbSIpOworICAgICAgICAgICAgICAgIGJkcnZfc2V0X3R5cGVfaGludChic190YWJs ZVsyXSwgQkRSVl9UWVBFX0NEUk9NKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIC8qIG9wZW4g dGhlIHZpcnR1YWwgYmxvY2sgZGV2aWNlcyAqLwo= --=__PartE9CC9A7F.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=__PartE9CC9A7F.0__=--