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
----------------------------------------------------------------------
(cherry picked from commit 73cef2cca413c17f314724c66194315038ea66c3)

diff --git a/xenstore.c b/xenstore.c
index 264cf977e180ed2b727b8e00002258114aa2604a..b6d86ce1e01f6c31e35a86c0d2d91ca1c216f5fa 100644 (file)
--- a/xenstore.c
+++ b/xenstore.c
@@ -999,10 +999,6 @@ void xenstore_process_event(void *opaque)
         goto out;
     }
 
-    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' -"