From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 18 Mar 2010 16:50:44 +0000 (+0000)
Subject: Allow changing CD for /dev/xvdX devices.
X-Git-Tag: xen-4.0.0-rc7
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=73cef2cca413c17f314724c66194315038ea66c3;p=qemu-xen-4.6-testing.git

Allow changing CD for /dev/xvdX devices.

We found the issue being not able to change CD on the HVM-Domain.
It is possible on the /dev/hdc device,
but it is impossible on the/dev/xvdc device.

We want to work it as all /dev/xvdX devices on the HVM-domain
 as well as on the PV-domain.

Signed-off-by: Takanori Kasai <kasai.takanori@jp.fujitsu.com>

The execution method is as follows.
----------------------------------------------------------------------
Domain configuration file:
 disk = ["tap:aio:/<guest image file>,xvda,w", ",xvdc:cdrom,r"]

Operation that assign CD:
 # xm block-configure <domain> file:<iso image> xvdc:cdrom r

Operation that releases CD
 # xm block-configure <domain> '' xvdc:cdrom r
----------------------------------------------------------------------
---

diff --git a/xenstore.c b/xenstore.c
index 05a1c22ef..89b1938c8 100644
--- a/xenstore.c
+++ b/xenstore.c
@@ -968,10 +968,6 @@ void xenstore_process_event(void *opaque)
             xenstore_watch_callbacks[i].cb(vec[XS_WATCH_TOKEN],
                                            xenstore_watch_callbacks[i].opaque);
 
-    if (strncmp(vec[XS_WATCH_TOKEN], "hd", 2) ||
-        strlen(vec[XS_WATCH_TOKEN]) != 3)
-        goto out;
-
     hd_index = drive_name_to_index(vec[XS_WATCH_TOKEN]);
     if (hd_index == -1) {
 	fprintf(stderr,"medium change watch on `%s' -"