>From 1064db784877ed33f2178112ada78232f972490c Mon Sep 17 00:00:00 2001
From: Stuart Jansen <sjansen@gurulabs.com>
Date: Thu, 23 Oct 2008 11:00:39 -0600
Subject: [PATCH] Allow changing ejectable device in domains using default qemu emulator

When a qemu domain is launched using the default emulator, attempts to
attach a device to the running domain will fail with the error:
"Error Connecting CDROM: internal error\nCannot determine QEMU argv syntax (null)".
The following fix is based on similar code in qemudStartVMDaemon() and
qemudBuildCommandLine().
---
 src/qemu_driver.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 34f743b..ad64a61 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -2397,6 +2397,7 @@ static int qemudDomainChangeEjectableMedia(virDomainPtr dom,
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(&driver->domains, dom->uuid);
     virDomainDiskDefPtr origdisk, newdisk;
+    const char *emulator;
     char *cmd, *reply, *safe_path;
     char *devname = NULL;
     unsigned int qemuCmdFlags;
@@ -2426,12 +2427,18 @@ static int qemudDomainChangeEjectableMedia(virDomainPtr dom,
         return -1;
     }
 
-    if (qemudExtractVersionInfo(vm->def->emulator,
+    emulator = vm->def->emulator;
+    if (!emulator)
+        emulator = virDomainDefDefaultEmulator(dom->conn, vm->def, driver->caps);
+    if (!emulator)
+        return -1;
+
+    if (qemudExtractVersionInfo(emulator,
                                 NULL,
                                 &qemuCmdFlags) < 0) {
         qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
                          _("Cannot determine QEMU argv syntax %s"),
-                         vm->def->emulator);
+                         emulator);
         return -1;
     }
 
-- 
1.5.5.1

