[qemu] Use xenstore to configure ioemu block devices.

- read ioemu block device config from xenstore
- don't require the ioemu: prefix on block devices any longer
- allow change of media associated with cdrom drives
- replace cdrom= option by :cdrom suffix on regular block device config:
  'file:/root/mytest.iso,hdc:cdrom,r'
- don't create default cdrom drive anymore - to create default empty
  cdrom drive use: ',hdc:cdrom,r'

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>

12 files changed, 278 insertions, 43 deletions

diff --git a/tools/examples/block b/tools/examples/block
index dae32dc234..14af64a66d 100644
--- a/tools/examples/block
+++ b/tools/examples/block
@@ -239,8 +239,11 @@ case "$command" in
       exit 0
     fi
 
-    p=$(xenstore_read "$XENBUS_PATH/params")
-    mode=$(xenstore_read "$XENBUS_PATH/mode")
+    if [ -n "$t" ]
+    then
+      p=$(xenstore_read "$XENBUS_PATH/params")
+      mode=$(xenstore_read "$XENBUS_PATH/mode")
+    fi
 
     case $t in 
       phy)
@@ -370,6 +373,13 @@ mount it read-write in a guest domain."
         release_lock "block"
         exit 0
 	;;
+
+      "")
+        claim_lock "block"
+        success
+        echo happy gun \"$t\" >>/tmp/block.$$
+        release_lock "block"
+	;;
     esac
     ;;
 
@@ -384,6 +394,10 @@ mount it read-write in a guest domain."
 	losetup -d "$node"
 	exit 0
 	;;
+
+      "")
+        exit 0
+	;;
     esac
     ;;
 
diff --git a/tools/examples/xmexample.hvm b/tools/examples/xmexample.hvm
index 2d2eef8735..b303adfead 100644
--- a/tools/examples/xmexample.hvm
+++ b/tools/examples/xmexample.hvm
@@ -66,7 +66,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
 # and MODE is r for read-only, w for read-write.
 
 #disk = [ 'phy:hda1,hda1,r' ]
-disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ]
+disk = [ 'file:/var/images/min-el3-i386.img,hda,w', ',hdc:cdrom,r' ]
 
 #----------------------------------------------------------------------------
 # Configure the behaviour when a domain exits.  There are three 'reasons'
@@ -111,10 +111,6 @@ disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ]
 device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm'
 
 #-----------------------------------------------------------------------------
-# Disk image for 
-#cdrom=
-
-#-----------------------------------------------------------------------------
 # boot on floppy (a), hard disk (c) or CD-ROM (d) 
 #boot=[a|c|d]
 #-----------------------------------------------------------------------------
diff --git a/tools/ioemu/Makefile.target b/tools/ioemu/Makefile.target
index 253fef1b5d..e08247310d 100644
--- a/tools/ioemu/Makefile.target
+++ b/tools/ioemu/Makefile.target
@@ -336,6 +336,7 @@ VL_OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
 VL_OBJS+= fdc.o mc146818rtc.o serial.o pc.o
 VL_OBJS+= cirrus_vga.o mixeng.o parallel.o
 VL_OBJS+= piix4acpi.o
+VL_OBJS+= xenstore.o
 DEFINES += -DHAS_AUDIO
 endif
 ifeq ($(TARGET_BASE_ARCH), ppc)
diff --git a/tools/ioemu/block.c b/tools/ioemu/block.c
index b908167186..9c628f93bf 100644
--- a/tools/ioemu/block.c
+++ b/tools/ioemu/block.c
@@ -750,6 +750,7 @@ static int raw_write(BlockDriverState *bs, int64_t sector_num,
 static void raw_close(BlockDriverState *bs)
 {
     BDRVRawState *s = bs->opaque;
+    bs->total_sectors = 0;
     close(s->fd);
 }
 
diff --git a/tools/ioemu/hw/ide.c b/tools/ioemu/hw/ide.c
index 9769dfee5f..444bfe6184 100644
--- a/tools/ioemu/hw/ide.c
+++ b/tools/ioemu/hw/ide.c
@@ -1279,6 +1279,7 @@ static void ide_atapi_cmd(IDEState *s)
         } else {
             ide_atapi_cmd_error(s, SENSE_NOT_READY, 
                                 ASC_MEDIUM_NOT_PRESENT);
+            xenstore_check_new_media_present(1000);
         }
         break;
     case GPCMD_MODE_SENSE_10:
diff --git a/tools/ioemu/monitor.c b/tools/ioemu/monitor.c
index e5d49d7192..071c62a35a 100644
--- a/tools/ioemu/monitor.c
+++ b/tools/ioemu/monitor.c
@@ -24,6 +24,7 @@
 #include "vl.h"
 #include "disas.h"
 #include <dirent.h>
+#include "block_int.h"
 
 //#define DEBUG
 //#define DEBUG_COMPLETION
@@ -328,7 +329,7 @@ static int eject_device(BlockDriverState *bs, int force)
     return 0;
 }
 
-static void do_eject(int force, const char *filename)
+void do_eject(int force, const char *filename)
 {
     BlockDriverState *bs;
 
@@ -340,7 +341,7 @@ static void do_eject(int force, const char *filename)
     eject_device(bs, force);
 }
 
-static void do_change(const char *device, const char *filename)
+void do_change(const char *device, const char *filename)
 {
     BlockDriverState *bs;
     int i;
diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c
index d5f71c45ca..1f2edace32 100644
--- a/tools/ioemu/vl.c
+++ b/tools/ioemu/vl.c
@@ -4709,9 +4709,11 @@ void help(void)
            "Standard options:\n"
            "-M machine      select emulated machine (-M ? for list)\n"
            "-fda/-fdb file  use 'file' as floppy disk 0/1 image\n"
+#ifndef CONFIG_DM
            "-hda/-hdb file  use 'file' as IDE hard disk 0/1 image\n"
            "-hdc/-hdd file  use 'file' as IDE hard disk 2/3 image\n"
            "-cdrom file     use 'file' as IDE cdrom image (cdrom is ide1 master)\n"
+#endif /* !CONFIG_DM */
            "-boot [a|c|d]   boot on floppy (a), hard disk (c) or CD-ROM (d)\n"
 	   "-snapshot       write to temporary files instead of disk image files\n"
            "-m megs         set virtual RAM size to megs MB [default=%d]\n"
@@ -4841,11 +4843,13 @@ enum {
     QEMU_OPTION_M,
     QEMU_OPTION_fda,
     QEMU_OPTION_fdb,
+#ifndef CONFIG_DM
     QEMU_OPTION_hda,
     QEMU_OPTION_hdb,
     QEMU_OPTION_hdc,
     QEMU_OPTION_hdd,
     QEMU_OPTION_cdrom,
+#endif /* !CONFIG_DM */
     QEMU_OPTION_boot,
     QEMU_OPTION_snapshot,
     QEMU_OPTION_m,
@@ -4911,11 +4915,13 @@ const QEMUOption qemu_options[] = {
     { "M", HAS_ARG, QEMU_OPTION_M },
     { "fda", HAS_ARG, QEMU_OPTION_fda },
     { "fdb", HAS_ARG, QEMU_OPTION_fdb },
+#ifndef CONFIG_DM
     { "hda", HAS_ARG, QEMU_OPTION_hda },
     { "hdb", HAS_ARG, QEMU_OPTION_hdb },
     { "hdc", HAS_ARG, QEMU_OPTION_hdc },
     { "hdd", HAS_ARG, QEMU_OPTION_hdd },
     { "cdrom", HAS_ARG, QEMU_OPTION_cdrom },
+#endif /* !CONFIG_DM */
     { "boot", HAS_ARG, QEMU_OPTION_boot },
     { "snapshot", 0, QEMU_OPTION_snapshot },
     { "m", HAS_ARG, QEMU_OPTION_m },
@@ -5250,10 +5256,16 @@ int main(int argc, char **argv)
 #ifdef CONFIG_GDBSTUB
     int use_gdbstub, gdbstub_port;
 #endif
-    int i, cdrom_index;
+    int i;
+#ifndef CONFIG_DM
+    int cdrom_index;
+#endif /* !CONFIG_DM */
     int snapshot, linux_boot;
     const char *initrd_filename;
-    const char *hd_filename[MAX_DISKS], *fd_filename[MAX_FD];
+#ifndef CONFIG_DM
+    const char *hd_filename[MAX_DISKS];
+#endif /* !CONFIG_DM */
+    const char *fd_filename[MAX_FD];
     const char *kernel_filename, *kernel_cmdline;
     DisplayState *ds = &display_state;
     int cyls, heads, secs, translation;
@@ -5288,8 +5300,10 @@ int main(int argc, char **argv)
     initrd_filename = NULL;
     for(i = 0; i < MAX_FD; i++)
         fd_filename[i] = NULL;
+#ifndef CONFIG_DM
     for(i = 0; i < MAX_DISKS; i++)
         hd_filename[i] = NULL;
+#endif /* !CONFIG_DM */
     ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
     vga_ram_size = VGA_RAM_SIZE;
     bios_size = BIOS_SIZE;
@@ -5302,11 +5316,13 @@ int main(int argc, char **argv)
     vncviewer = 0;
     kernel_filename = NULL;
     kernel_cmdline = "";
+#ifndef CONFIG_DM
 #ifdef TARGET_PPC
     cdrom_index = 1;
 #else
     cdrom_index = 2;
 #endif
+#endif /* !CONFIG_DM */
     cyls = heads = secs = 0;
     translation = BIOS_ATA_TRANSLATION_AUTO;
     pstrcpy(monitor_device, sizeof(monitor_device), "vc");
@@ -5339,7 +5355,11 @@ int main(int argc, char **argv)
             break;
         r = argv[optind];
         if (r[0] != '-') {
+#ifndef CONFIG_DM
             hd_filename[0] = argv[optind++];
+#else
+            help();
+#endif /* !CONFIG_DM */
         } else {
             const QEMUOption *popt;
 
@@ -5383,6 +5403,7 @@ int main(int argc, char **argv)
             case QEMU_OPTION_initrd:
                 initrd_filename = optarg;
                 break;
+#ifndef CONFIG_DM
             case QEMU_OPTION_hda:
             case QEMU_OPTION_hdb:
             case QEMU_OPTION_hdc:
@@ -5395,6 +5416,7 @@ int main(int argc, char **argv)
                         cdrom_index = -1;
                 }
                 break;
+#endif /* !CONFIG_DM */
             case QEMU_OPTION_snapshot:
                 snapshot = 1;
                 break;
@@ -5447,11 +5469,13 @@ int main(int argc, char **argv)
             case QEMU_OPTION_append:
                 kernel_cmdline = optarg;
                 break;
+#ifndef CONFIG_DM
             case QEMU_OPTION_cdrom:
                 if (cdrom_index >= 0) {
                     hd_filename[cdrom_index] = optarg;
                 }
                 break;
+#endif /* !CONFIG_DM */
             case QEMU_OPTION_boot:
                 boot_device = optarg[0];
                 if (boot_device != 'a' && 
@@ -5690,12 +5714,18 @@ int main(int argc, char **argv)
         }
     }
 
+#ifdef CONFIG_DM
+    bdrv_init();
+    xenstore_parse_domain_config(domid);
+#endif /* CONFIG_DM */
+
 #ifdef USE_KQEMU
     if (smp_cpus > 1)
         kqemu_allowed = 0;
 #endif
     linux_boot = (kernel_filename != NULL);
         
+#ifndef CONFIG_DM
     if (!linux_boot && 
         hd_filename[0] == '\0' && 
         (cdrom_index >= 0 && hd_filename[cdrom_index] == '\0') &&
@@ -5709,6 +5739,7 @@ int main(int argc, char **argv)
         else
             boot_device = 'd';
     }
+#endif /* !CONFIG_DM */
 
 #if !defined(CONFIG_SOFTMMU)
     /* must avoid mmap() usage of glibc by setting a buffer "by hand" */
@@ -5848,6 +5879,7 @@ int main(int argc, char **argv)
 
 #endif /* !CONFIG_DM */
 
+#ifndef CONFIG_DM
     /* we always create the cdrom drive, even if no disk is there */
     bdrv_init();
     if (cdrom_index >= 0) {
@@ -5874,6 +5906,7 @@ int main(int argc, char **argv)
             }
         }
     }
+#endif /* !CONFIG_DM */
 
     /* we always create at least one floppy disk */
     fd_table[0] = bdrv_new("fda");
@@ -6009,6 +6042,8 @@ int main(int argc, char **argv)
 #endif
     init_timers();
 
+    qemu_set_fd_handler(xenstore_fd(), xenstore_process_event, NULL, NULL);
+
     machine->init(ram_size, vga_ram_size, boot_device,
                   ds, fd_filename, snapshot,
                   kernel_filename, kernel_cmdline, initrd_filename,
diff --git a/tools/ioemu/vl.h b/tools/ioemu/vl.h
index e10bfcc058..28990cb8dd 100644
--- a/tools/ioemu/vl.h
+++ b/tools/ioemu/vl.h
@@ -1092,6 +1092,8 @@ void term_flush(void);
 void term_print_help(void);
 void monitor_readline(const char *prompt, int is_password,
                       char *buf, int buf_size);
+void do_eject(int force, const char *filename);
+void do_change(const char *device, const char *filename);
 
 /* readline.c */
 typedef void ReadLineFunc(void *opaque, const char *str);
@@ -1104,6 +1106,13 @@ const char *readline_get_history(unsigned int index);
 void readline_start(const char *prompt, int is_password,
                     ReadLineFunc *readline_func, void *opaque);
 
+/* xenstore.c */
+void xenstore_parse_domain_config(int domid);
+int xenstore_fd(void);
+void xenstore_process_event(void *opaque);
+void xenstore_check_new_media_present(int timeout);
+
+
 void kqemu_record_dump(void);
 
 extern char domain_name[];
diff --git a/tools/ioemu/xenstore.c b/tools/ioemu/xenstore.c
new file mode 100644
index 0000000000..e1c20bb180
--- /dev/null
+++ b/tools/ioemu/xenstore.c
@@ -0,0 +1,187 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License.  See the file "COPYING" in the main directory of
+ * this archive for more details.
+ *
+ * Copyright (C) 2006 Christian Limpach
+ * Copyright (C) 2006 XenSource Ltd.
+ *
+ */
+
+#include "vl.h"
+#include "block_int.h"
+
+static struct xs_handle *xsh = NULL;
+static char *hd_filename[MAX_DISKS];
+static QEMUTimer *insert_timer = NULL;
+
+static int pasprintf(char **buf, const char *fmt, ...)
+{
+    va_list ap;
+    int ret = 0;
+
+    if (*buf)
+	free(*buf);
+    va_start(ap, fmt);
+    if (vasprintf(buf, fmt, ap) == -1) {
+	buf = NULL;
+	ret = -1;
+    }
+    va_end(ap);
+    return ret;
+}
+
+static void insert_media(void *opaque)
+{
+    int i;
+
+    for (i = 0; i < MAX_DISKS; i++) {
+	if (hd_filename[i]) {
+	    do_change(bs_table[i]->device_name, hd_filename[i]);
+	    free(hd_filename[i]);
+	    hd_filename[i] = NULL;
+	}
+    }
+}
+
+void xenstore_check_new_media_present(int timeout)
+{
+
+    if (insert_timer == NULL)
+	insert_timer = qemu_new_timer(rt_clock, insert_media, NULL);
+    qemu_mod_timer(insert_timer, qemu_get_clock(rt_clock) + timeout);
+}
+
+void xenstore_parse_domain_config(int domid)
+{
+    char **e = NULL;
+    char *buf = NULL, *path;
+    char *bpath = NULL, *dev = NULL, *params = NULL, *type = NULL;
+    int i;
+    unsigned int len, num, hd_index;
+
+    for(i = 0; i < MAX_DISKS; i++)
+        hd_filename[i] = NULL;
+
+    xsh = xs_daemon_open();
+    if (xsh == NULL) {
+	fprintf(logfile, "Could not contact xenstore for domain config\n");
+	return;
+    }
+
+    path = xs_get_domain_path(xsh, domid);
+    if (path == NULL) {
+        fprintf(logfile, "xs_get_domain_path() error\n");
+        goto out;
+    }
+
+    if (pasprintf(&buf, "%s/device/vbd", path) == -1)
+	goto out;
+
+    e = xs_directory(xsh, XBT_NULL, buf, &num);
+    if (e == NULL)
+	goto out;
+
+    for (i = 0; i < num; i++) {
+	/* read the backend path */
+	if (pasprintf(&buf, "%s/device/vbd/%s/backend", path, e[i]) == -1)
+	    continue;
+	free(bpath);
+        bpath = xs_read(xsh, XBT_NULL, buf, &len);
+	if (bpath == NULL)
+	    continue;
+	/* read the name of the device */
+	if (pasprintf(&buf, "%s/dev", bpath) == -1)
+	    continue;
+	free(dev);
+	dev = xs_read(xsh, XBT_NULL, buf, &len);
+	if (dev == NULL)
+	    continue;
+	if (strncmp(dev, "hd", 2) || strlen(dev) != 3)
+	    continue;
+	hd_index = dev[2] - 'a';
+	if (hd_index > MAX_DISKS)
+	    continue;
+	/* read the type of the device */
+	if (pasprintf(&buf, "%s/device/vbd/%s/device-type", path, e[i]) == -1)
+	    continue;
+	free(type);
+	type = xs_read(xsh, XBT_NULL, buf, &len);
+	/* read params to get the patch of the image -- read it last
+	 * so that we have its path in buf when setting up the
+	 * watch */
+	if (pasprintf(&buf, "%s/params", bpath) == -1)
+	    continue;
+	free(params);
+	params = xs_read(xsh, XBT_NULL, buf, &len);
+	if (params == NULL)
+	    continue;
+	if (params[0]) {
+	    hd_filename[hd_index] = params;	/* strdup() */
+	    params = NULL;		/* don't free params on re-use */
+	}
+	bs_table[hd_index] = bdrv_new(dev);
+	/* check if it is a cdrom */
+	if (type && !strcmp(type, "cdrom")) {
+	    bdrv_set_type_hint(bs_table[hd_index], BDRV_TYPE_CDROM);
+	    xs_watch(xsh, buf, dev);
+	}
+	if (hd_filename[hd_index]) {
+            if (bdrv_open(bs_table[hd_index], hd_filename[hd_index],
+			  0 /* snapshot */) < 0)
+                fprintf(stderr, "qemu: could not open hard disk image '%s'\n",
+                        hd_filename[hd_index]);
+	}
+    }
+
+ out:
+    free(type);
+    free(params);
+    free(dev);
+    free(bpath);
+    free(buf);
+    free(path);
+    free(e);
+    return;
+}
+
+int xenstore_fd(void)
+{
+    if (xsh)
+	return xs_fileno(xsh);
+    return -1;
+}
+
+void xenstore_process_event(void *opaque)
+{
+    char **vec, *image = NULL;
+    unsigned int len, num, hd_index;
+
+    vec = xs_read_watch(xsh, &num);
+    if (!vec)
+	return;
+
+    if (strncmp(vec[XS_WATCH_TOKEN], "hd", 2) ||
+	strlen(vec[XS_WATCH_TOKEN]) != 3)
+	goto out;
+    hd_index = vec[XS_WATCH_TOKEN][2] - 'a';
+    image = xs_read(xsh, XBT_NULL, vec[XS_WATCH_PATH], &len);
+    if (image == NULL || !strcmp(image, bs_table[hd_index]->filename))
+	goto out;		/* gone or identical */
+
+    do_eject(0, vec[XS_WATCH_TOKEN]);
+    bs_table[hd_index]->filename[0] = 0;
+    if (hd_filename[hd_index]) {
+	free(hd_filename[hd_index]);
+	hd_filename[hd_index] = NULL;
+    }
+
+    if (image[0]) {
+	hd_filename[hd_index] = strdup(image);
+	xenstore_check_new_media_present(5000);
+    }
+
+ out:
+    free(image);
+    free(vec);
+}
diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 12606a58bd..d74668ab27 100644
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -249,7 +249,7 @@ class HVMImageHandler(ImageHandler):
     # Return a list of cmd line args to the device models based on the
     # xm config file
     def parseDeviceModelArgs(self, imageConfig, deviceConfig):
-        dmargs = [ 'cdrom', 'boot', 'fda', 'fdb', 'audio',
+        dmargs = [ 'boot', 'fda', 'fdb', 'audio',
                    'localtime', 'serial', 'stdvga', 'isa', 'vcpus',
 		   'usb', 'usbdevice']
         ret = []
@@ -277,24 +277,11 @@ class HVMImageHandler(ImageHandler):
         for (name, info) in deviceConfig:
             if name == 'vbd':
                 uname = sxp.child_value(info, 'uname')
-                typedev = sxp.child_value(info, 'dev')
-                (_, vbdparam) = string.split(uname, ':', 1)
-
-                if 'file:' in uname and not os.path.isfile(vbdparam):
-                   raise VmError('Disk image does not exist: %s' % vbdparam)
-
-                if 'ioemu:' in typedev:
-                    (emtype, vbddev) = string.split(typedev, ':', 1)
-                else:
-                    emtype = 'vbd'
-                    vbddev = typedev
-                if emtype == 'vbd':
-                    continue;
-                vbddev_list = ['hda', 'hdb', 'hdc', 'hdd']
-                if vbddev not in vbddev_list:
-                    raise VmError("hvm: for qemu vbd type=file&dev=hda~hdd")
-                ret.append("-%s" % vbddev)
-                ret.append("%s" % vbdparam)
+                if 'file:' in uname:
+                    (_, vbdparam) = string.split(uname, ':', 1)
+                    if not os.path.isfile(vbdparam):
+                        raise VmError('Disk image does not exist: %s' %
+                                      vbdparam)
             if name == 'vif':
                 type = sxp.child_value(info, 'type')
                 if type != 'ioemu':
diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py
index 986d065be9..d131ea7843 100644
--- a/tools/python/xen/xend/server/blkif.py
+++ b/tools/python/xen/xend/server/blkif.py
@@ -45,7 +45,17 @@ class BlkifController(DevController):
 
         dev = sxp.child_value(config, 'dev')
 
-        (typ, params) = string.split(uname, ':', 1)
+        if 'ioemu:' in dev:
+            (_, dev) = string.split(dev, ':', 1)
+        try:
+            (dev, dev_type) = string.split(dev, ':', 1)
+        except ValueError:
+            dev_type = "disk"
+
+        try:
+            (typ, params) = string.split(uname, ':', 1)
+        except ValueError:
+            (typ, params) = ("", "")
         back = { 'dev'    : dev,
                  'type'   : typ,
                  'params' : params,
@@ -58,13 +68,10 @@ class BlkifController(DevController):
                          'acm_ssidref': str(ssidref),
                          'acm_policy' : policy})
 
-        if 'ioemu:' in dev:
-            (dummy, dev1) = string.split(dev, ':', 1)
-            devid = blkif.blkdev_name_to_number(dev1)
-            front = {}
-        else:
-            devid = blkif.blkdev_name_to_number(dev)
-            front = { 'virtual-device' : "%i" % devid }
+        devid = blkif.blkdev_name_to_number(dev)
+        front = { 'virtual-device' : "%i" % devid,
+                  'device-type' : dev_type
+                }
 
         return (devid, back, front)
 
diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index 77b0301772..109e8a8741 100644
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -392,10 +392,6 @@ gopts.var('isa', val='no|yes',
           fn=set_bool, default=0,
           use="Simulate an ISA only system?")
 
-gopts.var('cdrom', val='FILE',
-          fn=set_value, default='',
-          use="Path to cdrom")
-
 gopts.var('boot', val="a|b|c|d",
           fn=set_value, default='c',
           use="Default boot device")
@@ -629,7 +625,7 @@ def configure_vifs(config_devs, vals):
 def configure_hvm(config_image, vals):
     """Create the config for HVM devices.
     """
-    args = [ 'device_model', 'pae', 'vcpus', 'cdrom', 'boot', 'fda', 'fdb',
+    args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb',
              'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'audio',
              'vnc', 'vncdisplay', 'vncconsole', 'sdl', 'display',
              'acpi', 'apic', 'xauthority', 'usb', 'usbdevice' ]