This patch introduces a new event type for the QMP event DEVICE_TRAY_MOVED, which occurs when the tray of a removable disk is moved (i.e opened or closed): VIR_DOMAIN_EVENT_ID_TRAY_MOVED The event's data includes the device alias and the tray's status, which indicates whether the tray has been opened or closed. Thus the callback definition for the event is: typedef void (*virConnectDomainEventTrayMovedCallback)(virConnectPtr conn, virDomainPtr dom, const char *devAlias, unsigned int trayOpened, void *opaque);

--- daemon/remote.c | 33 +++++++++++ examples/domain-events/events-c/event-test.c | 21 +++++++- examples/domain-events/events-python/event-test.py | 4 ++ include/libvirt/libvirt.h.in | 20 +++++++ python/libvirt-override-virConnect.py | 10 ++++ python/libvirt-override.c | 50 +++++++++++++++++ src/conf/domain_event.c | 58 ++++++++++++++++++++ src/conf/domain_event.h | 6 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_monitor.c | 13 +++++ src/qemu/qemu_monitor.h | 7 +++ src/qemu/qemu_monitor_json.c | 18 ++++++ src/qemu/qemu_process.c | 32 +++++++++++ src/remote/remote_driver.c | 34 ++++++++++++ src/remote/remote_protocol.x | 9 +++- src/remote_protocol-structs | 5 ++ 16 files changed, 320 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 74a5f16..cc464fd 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -505,6 +505,38 @@ mem_error: } +static int remoteRelayDomainEventTrayMoved(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *devAlias, + unsigned int trayOpened, + void *opaque) { + virNetServerClientPtr client = opaque; + remote_domain_event_tray_moved_msg data; + + if (!client) + return -1; + + VIR_DEBUG("Relaying domain %s %d tray moved devAlias: %s trayOpened: %s", + dom->name, dom->id, devAlias, trayOpened ? "yes": "no"); + + /* build return data */ + memset(&data, 0, sizeof data); + + if (!(data.devAlias = strdup(devAlias))) { + virReportOOMError(); + return -1; + } + data.trayOpened = trayOpened; + + make_nonnull_domain(&data.dom, dom); + + remoteDispatchDomainEventSend(client, remoteProgram, + REMOTE_PROC_DOMAIN_EVENT_TRAY_MOVED, + (xdrproc_t)xdr_remote_domain_event_tray_moved_msg, &data); + + return 0; +} + static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventLifecycle), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventReboot), @@ -516,6 +548,7 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventControlError), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventBlockJob), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventDiskChange), + VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventTrayMoved), }; verify(ARRAY_CARDINALITY(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST); diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index f4938c4..c7bcaeb 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -313,6 +313,17 @@ static int myDomainEventDiskChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, return 0; } +static int myDomainEventTrayMovedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *devAlias, + unsigned int trayOpened, + void *opaque ATTRIBUTE_UNUSED) +{ + printf("%s EVENT: Domain %s(%d) removable disk's tray moved devAlias: %s trayOpened: %s\n", + __func__, virDomainGetName(dom), virDomainGetID(dom), + devAlias, trayOpened ? "yes" : "no"); + return 0; +} static void myFreeFunc(void *opaque) { @@ -349,6 +360,7 @@ int main(int argc, char **argv) int callback7ret = -1; int callback8ret = -1; int callback9ret = -1; + int callback10ret = -1; struct sigaction action_stop; memset(&action_stop, 0, sizeof action_stop); @@ -419,6 +431,11 @@ int main(int argc, char **argv) VIR_DOMAIN_EVENT_ID_DISK_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(myDomainEventDiskChangeCallback), strdup("disk change"), myFreeFunc); + callback10ret = virConnectDomainEventRegisterAny(dconn, + NULL, + VIR_DOMAIN_EVENT_ID_TRAY_MOVED, + VIR_DOMAIN_EVENT_CALLBACK(myDomainEventTrayMovedCallback), + strdup("tray moved"), myFreeFunc); if ((callback1ret != -1) && (callback2ret != -1) && @@ -427,7 +444,8 @@ int main(int argc, char **argv) (callback5ret != -1) && (callback6ret != -1) && (callback7ret != -1) && - (callback9ret != -1)) { + (callback9ret != -1) && + (callback10ret != -1)) { if (virConnectSetKeepAlive(dconn, 5, 3) < 0) { virErrorPtr err = virGetLastError(); fprintf(stderr, "Failed to start keepalive protocol: %s\n", @@ -452,6 +470,7 @@ int main(int argc, char **argv) virConnectDomainEventDeregisterAny(dconn, callback6ret); virConnectDomainEventDeregisterAny(dconn, callback7ret); virConnectDomainEventDeregisterAny(dconn, callback9ret); + virConnectDomainEventDeregisterAny(dconn, callback10ret); if (callback8ret != -1) virConnectDomainEventDeregisterAny(dconn, callback8ret); } diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 0c75091..f2f5597 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -474,6 +474,9 @@ def myDomainEventGraphicsCallback(conn, dom, phase, localAddr, remoteAddr, authS def myDomainEventDiskChangeCallback(conn, dom, oldSrcPath, newSrcPath, devAlias, reason, opaque): print "myDomainEventDiskChangeCallback: Domain %s(%s) disk change oldSrcPath: %s newSrcPath: %s devAlias: %s reason: %s" % ( dom.name(), dom.ID(), oldSrcPath, newSrcPath, devAlias, reason) +def myDomainEventTrayMovedCallback(conn, dom, devAlias, trayOpened, opaque): + print "myDomainEventTrayMovedCallback: Domain %s(%s) tray moved devAlias: %s trayOpened: %d" % ( + dom.name(), dom.ID(), devAlias, trayOpened) def usage(out=sys.stderr): print >>out, "usage: "+os.path.basename(sys.argv[0])+" [-hdl] [uri]" print >>out, " uri will default to qemu:///system" @@ -532,6 +535,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_WATCHDOG, myDomainEventWatchdogCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_GRAPHICS, myDomainEventGraphicsCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DISK_CHANGE, myDomainEventDiskChangeCallback, None) + vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_TRAY_MOVED, myDomainEventTrayMovedCallback, None) vc.setKeepAlive(5, 3) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 58c4366..730f2a3 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3643,6 +3643,25 @@ typedef void (*virConnectDomainEventDiskChangeCallback)(virConnectPtr conn, const char *devAlias, int reason, void *opaque); +/** + * virConnectDomainEventTrayMovedCallback: + * @conn: connection object + * @dom: domain on which the event occurred + * @devAlias: device alias + * @trayOpened: the tray has been opened? + * @opaque: application specified data + * + * This callback occurs when the tray of a removable device is moved. + * + * The callback signature to use when registering for an event of type + * VIR_DOMAIN_EVENT_ID_TRAY_MOVED with virConnectDomainEventRegisterAny() + */ +typedef void (*virConnectDomainEventTrayMovedCallback)(virConnectPtr conn, + virDomainPtr dom, + const char *devAlias, + unsigned int trayOpened, + void *opaque); + /** * VIR_DOMAIN_EVENT_CALLBACK: @@ -3664,6 +3683,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_CONTROL_ERROR = 7, /* virConnectDomainEventGenericCallback */ VIR_DOMAIN_EVENT_ID_BLOCK_JOB = 8, /* virConnectDomainEventBlockJobCallback */ VIR_DOMAIN_EVENT_ID_DISK_CHANGE = 9, /* virConnectDomainEventDiskChangeCallback */ + VIR_DOMAIN_EVENT_ID_TRAY_MOVED = 10, /* virConnectDomainEventTrayMovedCallback */ #ifdef VIR_ENUM_SENTINELS /* diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py index b908b32..e93efa7 100644 --- a/python/libvirt-override-virConnect.py +++ b/python/libvirt-override-virConnect.py @@ -134,6 +134,16 @@ cb(self, virDomain(self, _obj=dom), oldSrcPath, newSrcPath, devAlias, reason, opaque) return 0; + def _dispatchDomainEventTrayMovedCallback(self, dom, devAlias, trayOpened, cbData): + """Dispatches event to python user domain trayMoved event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), devAlias, trayOpened, opaque) + return 0; + + def domainEventDeregisterAny(self, callbackID): """Removes a Domain Event Callback. De-registering for a domain callback will disable delivery of this event type """ diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 792cfa3..976c5d8 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -4927,6 +4927,53 @@ libvirt_virConnectDomainEventDiskChangeCallback(virConnectPtr conn ATTRIBUTE_UNU return ret; } +static int +libvirt_virConnectDomainEventTrayMovedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *devAlias, + unsigned int trayOpened, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + + pyobj_dom = libvirt_virDomainPtrWrap(dom); + Py_INCREF(pyobj_cbData); + + dictKey = libvirt_constcharPtrWrap("conn"); + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchDomainEventTrayMovedCallback", + (char*)"OsiO", + pyobj_dom, + devAlias, trayOpened, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + if(!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} + static PyObject * libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self, PyObject * args) @@ -4987,6 +5034,9 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self, case VIR_DOMAIN_EVENT_ID_DISK_CHANGE: cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventDiskChangeCallback); break; + case VIR_DOMAIN_EVENT_ID_TRAY_MOVED: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventTrayMovedCallback); + break; } if (!cb) { diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 1d8b45d..dbd1bf1 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -117,6 +117,10 @@ struct _virDomainEvent { char *devAlias; int reason; } diskChange; + struct { + char *devAlias; + unsigned int trayOpened :1; + } trayMoved; } data; }; @@ -546,6 +550,9 @@ void virDomainEventFree(virDomainEventPtr event) VIR_FREE(event->data.diskChange.newSrcPath); VIR_FREE(event->data.diskChange.devAlias); break; + case VIR_DOMAIN_EVENT_ID_TRAY_MOVED: + VIR_FREE(event->data.trayMoved.devAlias); + break; } VIR_FREE(event->dom.name); @@ -1043,6 +1050,50 @@ virDomainEventPtr virDomainEventDiskChangeNewFromDom(virDomainPtr dom, devAlias, reason); } +static virDomainEventPtr +virDomainEventTrayMovedNew(int id, const char *name, + unsigned char *uuid, + const char *devAlias, + unsigned int trayOpened) +{ + virDomainEventPtr ev = + virDomainEventNewInternal(VIR_DOMAIN_EVENT_ID_TRAY_MOVED, + id, name, uuid); + + if (ev) { + if (!(ev->data.trayMoved.devAlias = strdup(devAlias))) + goto error; + + ev->data.trayMoved.trayOpened = trayOpened; + } + + return ev; + +error: + virReportOOMError(); + virDomainEventFree(ev); + return NULL; +} + +virDomainEventPtr virDomainEventTrayMovedNewFromObj(virDomainObjPtr obj, + const char *devAlias, + unsigned int trayOpened) +{ + return virDomainEventTrayMovedNew(obj->def->id, + obj->def->name, + obj->def->uuid, + devAlias, + trayOpened); +} + +virDomainEventPtr virDomainEventTrayMovedNewFromDom(virDomainPtr dom, + const char *devAlias, + unsigned int trayOpened) +{ + return virDomainEventTrayMovedNew(dom->id, dom->name, dom->uuid, + devAlias, trayOpened); +} + /** * virDomainEventQueuePush: @@ -1167,6 +1218,13 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, cbopaque); break; + case VIR_DOMAIN_EVENT_ID_TRAY_MOVED: + ((virConnectDomainEventTrayMovedCallback)cb)(conn, dom, + event->data.trayMoved.devAlias, + event->data.trayMoved.trayOpened, + cbopaque); + break; + default: VIR_WARN("Unexpected event ID %d", event->eventID); break; diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 0e7cd75..3351be0 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -114,6 +114,12 @@ virDomainEventPtr virDomainEventDiskChangeNewFromDom(virDomainPtr dom, const char *newSrcPath, const char *devAlias, int reason); +virDomainEventPtr virDomainEventTrayMovedNewFromObj(virDomainObjPtr obj, + const char *devAlias, + unsigned int trayOpened); +virDomainEventPtr virDomainEventTrayMovedNewFromDom(virDomainPtr dom, + const char *devAlias, + unsigned int trayOpened); void virDomainEventFree(virDomainEventPtr event); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a104e70..27d4ad3 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -512,6 +512,8 @@ virDomainEventStateRegisterID; virDomainEventStateFree; virDomainEventStateNew; virDomainEventStateQueue; +virDomainEventTrayMovedNewFromDom; +virDomainEventTrayMovedNewFromObj; virDomainEventWatchdogNewFromDom; virDomainEventWatchdogNewFromObj; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 1da73f6..dfa2960 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1040,6 +1040,19 @@ int qemuMonitorEmitGraphics(qemuMonitorPtr mon, return ret; } +int qemuMonitorEmitTrayMoved(qemuMonitorPtr mon, + const char *devAlias, + unsigned int trayOpened) +{ + int ret = -1; + VIR_DEBUG("mon=%p", mon); + + QEMU_MONITOR_CALLBACK(mon, ret, domainTrayMoved, mon->vm, + devAlias, trayOpened); + + return ret; +} + int qemuMonitorEmitBlockJob(qemuMonitorPtr mon, const char *diskAlias, int type, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index b1c956c..18e6801 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -124,6 +124,10 @@ struct _qemuMonitorCallbacks { const char *diskAlias, int type, int status); + int (*domainTrayMoved)(qemuMonitorPtr mon, + virDomainObjPtr vm, + const char *devAlias, + unsigned int trayOpened); }; @@ -191,6 +195,9 @@ int qemuMonitorEmitGraphics(qemuMonitorPtr mon, const char *authScheme, const char *x509dname, const char *saslUsername); +int qemuMonitorEmitTrayMoved(qemuMonitorPtr mon, + const char *devAlias, + unsigned int trayOpened); int qemuMonitorEmitBlockJob(qemuMonitorPtr mon, const char *diskAlias, int type, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index c0f148b..ac6b02c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -59,6 +59,7 @@ static void qemuMonitorJSONHandleVNCConnect(qemuMonitorPtr mon, virJSONValuePtr static void qemuMonitorJSONHandleVNCInitialize(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleVNCDisconnect(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleBlockJob(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandleTrayMoved(qemuMonitorPtr mon, virJSONValuePtr data); static struct { const char *type; @@ -75,6 +76,7 @@ static struct { { "VNC_INITIALIZED", qemuMonitorJSONHandleVNCInitialize, }, { "VNC_DISCONNECTED", qemuMonitorJSONHandleVNCDisconnect, }, { "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJob, }, + { "DEVICE_TRAY_MOVED", qemuMonitorJSONHandleTrayMoved, }, }; @@ -725,6 +727,22 @@ out: qemuMonitorEmitBlockJob(mon, device, type, status); } +static void qemuMonitorJSONHandleTrayMoved(qemuMonitorPtr mon, virJSONValuePtr data) +{ + const char *devAlias = NULL; + bool trayOpened; + + if ((devAlias = virJSONValueObjectGetString(data, "device")) == NULL) { + VIR_WARN("missing device in tray moved event"); + return; + } + + if (virJSONValueObjectGetBoolean(data, "tray-open", &trayOpened) < 0) { + VIR_WARN("missing tray-open in tray moved event"); + return; + } + qemuMonitorEmitTrayMoved(mon, devAlias, (unsigned int)trayOpened); +} int qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7b99814..387811a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1021,6 +1021,37 @@ static void qemuProcessHandleMonitorDestroy(qemuMonitorPtr mon, virDomainObjUnlock(vm); } +static int +qemuProcessHandleTrayMoved(qemuMonitorPtr mon ATTRIBUTE_UNUSED, + virDomainObjPtr vm, + const char *devAlias, + unsigned int trayOpened) +{ + struct qemud_driver *driver = qemu_driver; + virDomainEventPtr event = NULL; + virDomainDiskDefPtr disk; + + virDomainObjLock(vm); + disk = qemuProcessFindDomainDiskByAlias(vm, devAlias); + + if (disk) { + event = virDomainEventTrayMovedNewFromObj(vm, + devAlias, + trayOpened); + } + + virDomainObjUnlock(vm); + + if (event) { + qemuDriverLock(driver); + qemuDomainEventQueue(driver, event); + qemuDriverUnlock(driver); + } + + return 0; +} + + static qemuMonitorCallbacks monitorCallbacks = { .destroy = qemuProcessHandleMonitorDestroy, .eofNotify = qemuProcessHandleMonitorEOF, @@ -1034,6 +1065,7 @@ static qemuMonitorCallbacks monitorCallbacks = { .domainIOError = qemuProcessHandleIOError, .domainGraphics = qemuProcessHandleGraphics, .domainBlockJob = qemuProcessHandleBlockJob, + .domainTrayMoved = qemuProcessHandleTrayMoved, }; static int diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 9e74cea..31d09a9 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -238,6 +238,11 @@ remoteDomainBuildEventDiskChange(virNetClientProgramPtr prog, virNetClientPtr client, void *evdata, void *opaque); +static void +remoteDomainBuildEventTrayMoved(virNetClientProgramPtr prog, + virNetClientPtr client, + void *evdata, void *opaque); + static virNetClientProgramEvent remoteDomainEvents[] = { { REMOTE_PROC_DOMAIN_EVENT_RTC_CHANGE, remoteDomainBuildEventRTCChange, @@ -279,6 +284,10 @@ static virNetClientProgramEvent remoteDomainEvents[] = { remoteDomainBuildEventDiskChange, sizeof(remote_domain_event_disk_change_msg), (xdrproc_t)xdr_remote_domain_event_disk_change_msg }, + { REMOTE_PROC_DOMAIN_EVENT_TRAY_MOVED, + remoteDomainBuildEventTrayMoved, + sizeof(remote_domain_event_tray_moved_msg), + (xdrproc_t)xdr_remote_domain_event_tray_moved_msg }, }; enum virDrvOpenRemoteFlags { @@ -3643,6 +3652,31 @@ remoteDomainBuildEventDiskChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, } +static void +remoteDomainBuildEventTrayMoved(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, + virNetClientPtr client ATTRIBUTE_UNUSED, + void *evdata, void *opaque) +{ + virConnectPtr conn = opaque; + struct private_data *priv = conn->privateData; + remote_domain_event_tray_moved_msg *msg = evdata; + virDomainPtr dom; + virDomainEventPtr event = NULL; + + dom = get_nonnull_domain(conn, msg->dom); + if (!dom) + return; + + event = virDomainEventTrayMovedNewFromDom(dom, + msg->devAlias, + msg->trayOpened); + + virDomainFree(dom); + + remoteDomainEventQueue(priv, event); +} + + static virDrvOpenStatus ATTRIBUTE_NONNULL (1) remoteSecretOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 4d845e7..73e554c 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2178,6 +2178,12 @@ struct remote_domain_event_disk_change_msg { int reason; }; +struct remote_domain_event_tray_moved_msg { + remote_nonnull_domain dom; + remote_nonnull_string devAlias; + unsigned int trayOpened; +}; + struct remote_domain_managed_save_args { remote_nonnull_domain dom; unsigned int flags; @@ -2765,7 +2771,8 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_SET_METADATA = 264, /* autogen autogen */ REMOTE_PROC_DOMAIN_GET_METADATA = 265, /* autogen autogen */ REMOTE_PROC_DOMAIN_BLOCK_REBASE = 266, /* autogen autogen */ - REMOTE_PROC_DOMAIN_PM_WAKEUP = 267 /* autogen autogen */ + REMOTE_PROC_DOMAIN_PM_WAKEUP = 267, /* autogen autogen */ + REMOTE_PROC_DOMAIN_EVENT_TRAY_MOVED = 268 /* autogen autogen */

On Mon, Mar 05, 2012 at 06:25:41PM +0800, Osier Yang wrote: > The "tray" is only allowed for removable disks, i.e. CDROM and > Floppy disks. > > As the value for "tray" defaults to "closed", lots of tests are > updated to include "tray='closed'" in the disk target XML. I would take that as an indication that "tray='closed'" should just be omitted in output and assumed on input > src/conf/domain_conf.c | 33 +++++++++++++++++++- > src/conf/domain_conf.h | 9 +++++ > tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 2 +- > .../qemuxml2argv-boot-complex-bootindex.xml | 6 ++-- > .../qemuxml2argvdata/qemuxml2argv-boot-complex.xml | 6 ++-- > .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 2 +- > ...uxml2argv-boot-menu-disable-drive-bootindex.xml | 2 +- > .../qemuxml2argv-boot-menu-disable-drive.xml | 2 +- > .../qemuxml2argv-boot-menu-disable.xml | 2 +- > .../qemuxml2argv-boot-menu-enable.xml | 2 +- > tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml | 2 +- > tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 4 +- > tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml | 2 +- > tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml | 2 +- > .../qemuxml2argv-disk-cdrom-empty.xml | 2 +- > tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 2 +- > .../qemuxml2argv-disk-copy_on_read.xml | 2 +- > .../qemuxml2argv-disk-drive-boot-cdrom.xml | 2 +- > .../qemuxml2argv-disk-drive-boot-disk.xml | 2 +- > .../qemuxml2argv-disk-drive-cache-directsync.xml | 2 +- > .../qemuxml2argv-disk-drive-cache-unsafe.xml | 2 +- > .../qemuxml2argv-disk-drive-cache-v1-none.xml | 2 +- > .../qemuxml2argv-disk-drive-cache-v1-wb.xml | 2 +- > .../qemuxml2argv-disk-drive-cache-v1-wt.xml | 2 +- > .../qemuxml2argv-disk-drive-cache-v2-none.xml | 2 +- > .../qemuxml2argv-disk-drive-cache-v2-wb.xml | 2 +- > .../qemuxml2argv-disk-drive-cache-v2-wt.xml | 2 +- > ...muxml2argv-disk-drive-error-policy-enospace.xml | 2 +- > .../qemuxml2argv-disk-drive-error-policy-stop.xml | 2 +- > ...rgv-disk-drive-error-policy-wreport-rignore.xml | 2 +- > .../qemuxml2argv-disk-drive-fmt-qcow.xml | 2 +- > .../qemuxml2argv-disk-drive-no-boot.xml | 4 +- > .../qemuxml2argv-disk-drive-readonly-disk.xml | 2 +- > .../qemuxml2argv-disk-drive-readonly-no-device.xml | 2 +- > .../qemuxml2argv-disk-drive-shared.xml | 2 +- > .../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 4 +- > .../qemuxml2argv-disk-ioeventfd.xml | 2 +- > tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml | 2 +- > .../qemuxml2argv-disk-snapshot.xml | 2 +- > .../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 2 +- > .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 2 +- > tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 2 +- > .../qemuxml2argv-floppy-drive-fat.xml | 2 +- > .../qemuxml2argv-graphics-spice-timeout.xml | 2 +- > tests/qemuxml2argvdata/qemuxml2argv-lease.xml | 2 +- > .../qemuxml2argv-net-bandwidth.xml | 2 +- > .../qemuxml2xmlout-graphics-spice-timeout.xml | 2 +- > tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml | 2 +- > tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml | 2 +- > tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml | 2 +- > tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml | 2 +- > tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml | 8 ++-- > tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml | 4 +- > tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml | 2 +- > tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml | 2 +- > tests/vmx2xmldata/vmx2xml-floppy-device.xml | 2 +- > tests/vmx2xmldata/vmx2xml-floppy-file.xml | 2 +- > tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml | 2 +- > tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml | 2 +- > 59 files changed, 109 insertions(+), 69 deletions(-) > > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c > index f9654f1..f359f8f 100644 > --- a/src/conf/domain_conf.c > +++ b/src/conf/domain_conf.c > @@ -613,6 +613,10 @@ VIR_ENUM_IMPL(virDomainStartupPolicy, VIR_DOMAIN_STARTUP_POLICY_LAST, > "requisite", > "optional"); > > +VIR_ENUM_IMPL(virDomainDiskTray, VIR_DOMAIN_DISK_TRAY_LAST, > + "closed", > + "open"); > + > #define virDomainReportError(code, ...) \ > virReportErrorHelper(VIR_FROM_DOMAIN, code, __FILE__, \ > __FUNCTION__, __LINE__, __VA_ARGS__) > @@ -2894,6 +2898,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, > char *authUsage = NULL; > char *authUUID = NULL; > char *usageType = NULL; > + char *tray = NULL; > > if (VIR_ALLOC(def)< 0) { > virReportOOMError(); > @@ -3002,6 +3007,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, > (xmlStrEqual(cur->name, BAD_CAST "target"))) { > target = virXMLPropString(cur, "dev"); > bus = virXMLPropString(cur, "bus"); > + tray = virXMLPropString(cur, "tray"); > > /* HACK: Work around for compat with Xen > * driver in previous libvirt releases */ > @@ -3271,6 +3277,25 @@ virDomainDiskDefParseXML(virCapsPtr caps, > } > } > > + if (tray) { > + if ((def->tray_status = virDomainDiskTrayTypeFromString(tray))< 0) { > + virDomainReportError(VIR_ERR_XML_ERROR, > + _("unknown disk tray status '%s'"), tray); > + goto error; > + } > + > + if (def->device != VIR_DOMAIN_DISK_DEVICE_FLOPPY&& > + def->device != VIR_DOMAIN_DISK_DEVICE_CDROM) { > + virDomainReportError(VIR_ERR_XML_ERROR, "%s", > + _("tray is only valid for cdrom and floppy")); > + goto error; > + } > + } else { > + if (def->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || > + def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) > + def->tray_status = VIR_DOMAIN_DISK_TRAY_CLOSED; > + } > + > if (def->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY&& > def->bus != VIR_DOMAIN_DISK_BUS_FDC) { > virDomainReportError(VIR_ERR_INTERNAL_ERROR, I don't see tray being freed here, so that sounds like a leak > @@ -10228,8 +10253,14 @@ virDomainDiskDefFormat(virBufferPtr buf, > } > } > > - virBufferAsprintf(buf, "<target dev='%s' bus='%s'/>\n", > + virBufferAsprintf(buf, "<target dev='%s' bus='%s'", > def->dst, bus); > + if (def->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || > + def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) I would make this conditional to if (def->tray_status != VIR_DOMAIN_DISK_TRAY_CLOSED) to avoid extra default data... > + virBufferAsprintf(buf, " tray='%s'/>\n", > + virDomainDiskTrayTypeToString(def->tray_status)); > + else > + virBufferAddLit(buf, "/>\n"); > > /*disk I/O throttling*/ > if (def->blkdeviotune.total_bytes_sec || > diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h > index d98a551..6fa06c7 100644 > --- a/src/conf/domain_conf.h > +++ b/src/conf/domain_conf.h > @@ -306,6 +306,13 @@ enum virDomainDiskProtocol { > VIR_DOMAIN_DISK_PROTOCOL_LAST > }; > > +enum virDomainDiskTray { > + VIR_DOMAIN_DISK_TRAY_CLOSED, > + VIR_DOMAIN_DISK_TRAY_OPEN, > + > + VIR_DOMAIN_DISK_TRAY_LAST > +}; > + > typedef struct _virDomainDiskHostDef virDomainDiskHostDef; > typedef virDomainDiskHostDef *virDomainDiskHostDefPtr; > struct _virDomainDiskHostDef { > @@ -398,6 +405,7 @@ struct _virDomainDiskDef { > char *src; > virSecurityDeviceLabelDefPtr seclabel; > char *dst; > + int tray_status; > int protocol; > int nhosts; > virDomainDiskHostDefPtr hosts; > @@ -2016,6 +2024,7 @@ VIR_ENUM_DECL(virDomainDiskProtocol) > VIR_ENUM_DECL(virDomainDiskIo) > VIR_ENUM_DECL(virDomainDiskSecretType) > VIR_ENUM_DECL(virDomainDiskSnapshot) > +VIR_ENUM_DECL(virDomainDiskTray) > VIR_ENUM_DECL(virDomainIoEventFd) > VIR_ENUM_DECL(virDomainVirtioEventIdx) > VIR_ENUM_DECL(virDomainDiskCopyOnRead) > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml > index 44a30de..9086528 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml > @@ -16,7 +16,7 @@ > <emulator>/usr/bin/qemu</emulator> > <disk type='block' device='cdrom'> > <source dev='/dev/cdrom'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml > index 8ee42e7..646aa4c 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml > @@ -37,17 +37,17 @@ > </disk> > <disk type='block' device='cdrom'> > <source dev='/dev/HostVG/hdc'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > <disk type='block' device='floppy'> > <source dev='/dev/fd1'/> > -<target dev='fdb' bus='fdc'/> > +<target dev='fdb' bus='fdc' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='1'/> > </disk> > <disk type='block' device='floppy'> > <source dev='/dev/fd0'/> > -<target dev='fda' bus='fdc'/> > +<target dev='fda' bus='fdc' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <controller type='usb' index='0'/> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml > index 8ee42e7..646aa4c 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml > @@ -37,17 +37,17 @@ > </disk> > <disk type='block' device='cdrom'> > <source dev='/dev/HostVG/hdc'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > <disk type='block' device='floppy'> > <source dev='/dev/fd1'/> > -<target dev='fdb' bus='fdc'/> > +<target dev='fdb' bus='fdc' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='1'/> > </disk> > <disk type='block' device='floppy'> > <source dev='/dev/fd0'/> > -<target dev='fda' bus='fdc'/> > +<target dev='fda' bus='fdc' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <controller type='usb' index='0'/> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml > index f55ee2c..e1566c3 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml > @@ -21,7 +21,7 @@ > </disk> > <disk type='file' device='floppy'> > <source file='/tmp/firmware.img'/> > -<target dev='fda' bus='fdc'/> > +<target dev='fda' bus='fdc' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <controller type='usb' index='0'/> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml > index 28b1b68..82a04c8 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml > @@ -17,7 +17,7 @@ > <emulator>/usr/bin/qemu</emulator> > <disk type='block' device='cdrom'> > <source dev='/dev/cdrom'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml > index 28b1b68..82a04c8 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml > @@ -17,7 +17,7 @@ > <emulator>/usr/bin/qemu</emulator> > <disk type='block' device='cdrom'> > <source dev='/dev/cdrom'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml > index 28b1b68..82a04c8 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml > @@ -17,7 +17,7 @@ > <emulator>/usr/bin/qemu</emulator> > <disk type='block' device='cdrom'> > <source dev='/dev/cdrom'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml > index 7847a99..2046881 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml > @@ -17,7 +17,7 @@ > <emulator>/usr/bin/qemu</emulator> > <disk type='block' device='cdrom'> > <source dev='/dev/cdrom'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml > index 85e6d91..07b7a85 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml > @@ -20,7 +20,7 @@ > <emulator>/usr/bin/qemu</emulator> > <disk type='block' device='cdrom'> > <source dev='/dev/cdrom'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml > index 69ba3c0..e805064 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml > @@ -20,7 +20,7 @@ > </disk> > <disk type='file' device='cdrom'> > <source file='/root/boot.iso'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <boot order='1'/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > @@ -36,7 +36,7 @@ > <disk type='file' device='floppy'> > <driver name='qemu' type='raw'/> > <source file='/dev/null'/> > -<target dev='fdb' bus='fdc'/> > +<target dev='fdb' bus='fdc' tray='closed'/> > <boot order='4'/> > <address type='drive' controller='0' bus='0' target='0' unit='1'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml > index be07426..811e801 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml > @@ -16,7 +16,7 @@ > <emulator>/usr/bin/xenner</emulator> > <disk type='block' device='cdrom'> > <source dev='/dev/cdrom'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml > index f1c9a42..9e6b816 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw' io='threads'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml > index 8fdcb1d..85c163d 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml > @@ -20,7 +20,7 @@ > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <disk type='file' device='cdrom'> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml > index ab09ed6..4378cf8 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml > @@ -21,7 +21,7 @@ > </disk> > <disk type='file' device='cdrom'> > <source file='/root/boot.iso'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml > index fb0bf2b..84df929 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml > @@ -23,7 +23,7 @@ > <disk type='file' device='cdrom'> > <driver name='qemu' type='raw'/> > <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml > index dda54f8..fbc0b09 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml > @@ -21,7 +21,7 @@ > </disk> > <disk type='block' device='cdrom'> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > <controller type='usb' index='0'/> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml > index cff1a42..36e2166 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml > @@ -21,7 +21,7 @@ > </disk> > <disk type='block' device='cdrom'> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > <controller type='usb' index='0'/> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml > index d32d569..6a58f68 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml > index f2362af..fd77bac 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml > index 078e2e7..d6facdb 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml > index 1e575ed..262be15 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml > index ffa8aba..f58b352 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml > index 4c33b5a..5045d70 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml > index cad8257..c093f07 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml > index 1af9a9f..16b77c5 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml > index e0182d6..bef1c7c 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml > index a1d55f9..77c4712 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml > index b52d397..b09f01f 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml > index 599993c..28ed7cd 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml > index 2ce27a5..e6100ea 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml > @@ -23,12 +23,12 @@ > </disk> > <disk type='block' device='cdrom'> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > <disk type='block' device='floppy'> > <source dev='/dev/fd0'/> > -<target dev='fda' bus='fdc'/> > +<target dev='fda' bus='fdc' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <controller type='usb' index='0'/> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml > index a3ecd9c..9c7515f 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml > @@ -21,7 +21,7 @@ > </disk> > <disk type='block' device='cdrom'> > <source dev='/dev/sr0'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml > index a3ecd9c..9c7515f 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml > @@ -21,7 +21,7 @@ > </disk> > <disk type='block' device='cdrom'> > <source dev='/dev/sr0'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml > index 674bbed..2b91830 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml > @@ -25,7 +25,7 @@ > <disk type='block' device='cdrom'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml > index 68e4f06..e2e85db 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml > @@ -21,12 +21,12 @@ > </disk> > <disk type='block' device='floppy'> > <source dev='/dev/fd0'/> > -<target dev='fda' bus='fdc'/> > +<target dev='fda' bus='fdc' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <disk type='file' device='floppy'> > <source file='/tmp/firmware.img'/> > -<target dev='fdb' bus='fdc'/> > +<target dev='fdb' bus='fdc' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='1'/> > </disk> > <controller type='usb' index='0'/> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml > index 00edada..4e55804 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml > @@ -23,7 +23,7 @@ > <disk type='file' device='cdrom'> > <driver name='qemu' type='raw'/> > <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml > index d89e57b..692290d 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml > @@ -16,7 +16,7 @@ > <emulator>/usr/bin/qemu</emulator> > <disk type='block' device='cdrom'> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > </disk> > <disk type='file' device='disk'> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml > index 0544c05..3aa201d 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml > @@ -23,7 +23,7 @@ > <disk type='block' device='cdrom' snapshot='no'> > <driver name='qemu' type='raw'/> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml > index 02d1fd3..a53899a 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml > @@ -21,7 +21,7 @@ > </disk> > <disk type='block' device='cdrom'> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml > index 9606a52..9d1ec22 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml > @@ -21,7 +21,7 @@ > </disk> > <disk type='block' device='cdrom'> > <source dev='/dev/HostVG/QEMUGuest2'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml > index a8131b9..567f4d6 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml > @@ -25,7 +25,7 @@ > <disk type='file' device='cdrom'> > <driver name='qemu' type='raw'/> > <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml > index 48bcdb7..29c4492 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml > @@ -17,7 +17,7 @@ > <disk type='dir' device='floppy'> > <driver name='qemu' type='fat'/> > <source dir='/var/somefiles'/> > -<target dev='fda' bus='fdc'/> > +<target dev='fda' bus='fdc' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml > index 17fb06c..505801a 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml > @@ -48,7 +48,7 @@ > <disk type='file' device='cdrom'> > <driver name='qemu' type='raw'/> > <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-lease.xml b/tests/qemuxml2argvdata/qemuxml2argv-lease.xml > index d42239c..d66af2f 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-lease.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-lease.xml > @@ -21,7 +21,7 @@ > </disk> > <disk type='file' device='cdrom'> > <source file='/root/boot.iso'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml > index 4b2e70c..ea698d0 100644 > --- a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml > +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml > @@ -30,7 +30,7 @@ > <disk type='file' device='cdrom'> > <driver name='qemu' type='raw'/> > <source file='/home/zippy/tmp/Fedora-14-x86_64-Live-KDE.iso'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml > index 16efb69..b2d6bfd 100644 > --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml > +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml > @@ -48,7 +48,7 @@ > <disk type='file' device='cdrom'> > <driver name='qemu' type='raw'/> > <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <readonly/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml > index 6cbdfe9..50712a6 100644 > --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml > +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml > @@ -13,7 +13,7 @@ > <devices> > <disk type='block' device='cdrom'> > <source dev='/dev/scd0'/> > -<target dev='hda' bus='ide'/> > +<target dev='hda' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <controller type='ide' index='0'/> > diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml > index 3bdb70b..de71ba6 100644 > --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml > +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml > @@ -13,7 +13,7 @@ > <devices> > <disk type='file' device='cdrom'> > <source file='[datastore] directory/cdrom.iso'/> > -<target dev='hda' bus='ide'/> > +<target dev='hda' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <controller type='ide' index='0'/> > diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml > index 00fbf4e..dafd4fb 100644 > --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml > +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml > @@ -13,7 +13,7 @@ > <devices> > <disk type='block' device='cdrom'> > <source dev='/dev/scd0'/> > -<target dev='sda' bus='scsi'/> > +<target dev='sda' bus='scsi' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <controller type='scsi' index='0'/> > diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml > index e8f2e9f..ca7ca1c 100644 > --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml > +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml > @@ -13,7 +13,7 @@ > <devices> > <disk type='file' device='cdrom'> > <source file='[datastore] directory/cdrom.iso'/> > -<target dev='sda' bus='scsi'/> > +<target dev='sda' bus='scsi' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <controller type='scsi' index='0'/> > diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml > index 2e07963..e98bb58 100644 > --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml > +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml > @@ -20,17 +20,17 @@ > </disk> > <disk type='file' device='cdrom'> > <source file='[datastore] directory/Debian1-cdrom.iso'/> > -<target dev='sdp' bus='scsi'/> > +<target dev='sdp' bus='scsi' tray='closed'/> > <address type='drive' controller='1' bus='0' target='0' unit='0'/> > </disk> > <disk type='file' device='cdrom'> > <source file='/vmimages/tools-isoimages/linux.iso'/> > -<target dev='hda' bus='ide'/> > +<target dev='hda' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <disk type='block' device='cdrom'> > <source dev='/dev/scd0'/> > -<target dev='hdb' bus='ide'/> > +<target dev='hdb' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='1'/> > </disk> > <disk type='file' device='disk'> > @@ -40,7 +40,7 @@ > </disk> > <disk type='block' device='floppy'> > <source dev='/dev/fd0'/> > -<target dev='fda' bus='fdc'/> > +<target dev='fda' bus='fdc' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <controller type='scsi' index='0' model='lsilogic'/> > diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml > index 0bc8eed..d35553f 100644 > --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml > +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml > @@ -19,12 +19,12 @@ > </disk> > <disk type='file' device='cdrom'> > <source file='[498076b2-02796c1a-ef5b-000ae484a6a3] Isos/debian-testing-amd64-netinst.iso'/> > -<target dev='hda' bus='ide'/> > +<target dev='hda' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <disk type='file' device='floppy'> > <source file='[498076b2-02796c1a-ef5b-000ae484a6a3] Debian2/dummy.flp'/> > -<target dev='fdb' bus='fdc'/> > +<target dev='fdb' bus='fdc' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='1'/> > </disk> > <controller type='scsi' index='0' model='lsilogic'/> > diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml > index ee23120..98faa9b 100644 > --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml > +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml > @@ -26,7 +26,7 @@ > </disk> > <disk type='file' device='cdrom'> > <source file='[4af0231d-1eff559a-6369-0024e84773b6] isos/CentOS-5.5-x86_64-bin-DVD-1of2.iso'/> > -<target dev='hda' bus='ide'/> > +<target dev='hda' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <controller type='scsi' index='0' model='lsilogic'/> > diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml > index 227308b..ec6a035 100644 > --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml > +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml > @@ -19,7 +19,7 @@ > </disk> > <disk type='file' device='cdrom'> > <source file='/usr/lib/vmware/isoimages/linux.iso'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > <controller type='scsi' index='0' model='vmpvscsi'/> > diff --git a/tests/vmx2xmldata/vmx2xml-floppy-device.xml b/tests/vmx2xmldata/vmx2xml-floppy-device.xml > index 8aef9c0..d6f3bab 100644 > --- a/tests/vmx2xmldata/vmx2xml-floppy-device.xml > +++ b/tests/vmx2xmldata/vmx2xml-floppy-device.xml > @@ -13,7 +13,7 @@ > <devices> > <disk type='block' device='floppy'> > <source dev='/dev/fd0'/> > -<target dev='fda' bus='fdc'/> > +<target dev='fda' bus='fdc' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <controller type='fdc' index='0'/> > diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.xml b/tests/vmx2xmldata/vmx2xml-floppy-file.xml > index c36e3f0..941118e 100644 > --- a/tests/vmx2xmldata/vmx2xml-floppy-file.xml > +++ b/tests/vmx2xmldata/vmx2xml-floppy-file.xml > @@ -13,7 +13,7 @@ > <devices> > <disk type='file' device='floppy'> > <source file='[datastore] directory/floppy.flp'/> > -<target dev='fda' bus='fdc'/> > +<target dev='fda' bus='fdc' tray='closed'/> > <address type='drive' controller='0' bus='0' target='0' unit='0'/> > </disk> > <controller type='fdc' index='0'/> > diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml > index 4c958ae..0081adf 100644 > --- a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml > +++ b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml > @@ -19,7 +19,7 @@ > </disk> > <disk type='file' device='cdrom'> > <source file='/usr/lib/vmware/isoimages/linux.iso'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > <controller type='scsi' index='0' model='lsilogic'/> > diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml > index 0501a45..28753a2 100644 > --- a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml > +++ b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml > @@ -19,7 +19,7 @@ > </disk> > <disk type='file' device='cdrom'> > <source file='/usr/lib/vmware/isoimages/linux.iso'/> > -<target dev='hdc' bus='ide'/> > +<target dev='hdc' bus='ide' tray='closed'/> > <address type='drive' controller='0' bus='1' target='0' unit='0'/> > </disk> > <controller type='scsi' index='0' model='lsilogic'/> I'm not 100% sure what is the best approach but I would avoid putting tray='closed' systematically on output.

This is similiar with physical world, one will be surprised if the box starts with medium exists while the tray is open. New tests are added, tests disk-{cdrom,floppy}-tray are for the qemu supports "-device" flag, and disk-{cdrom,floppy}-no-device-cap are for old qemu, i.e. which doesn't support "-device" flag. --- src/qemu/qemu_command.c | 16 ++++++- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 4 ++ .../qemuxml2argv-disk-cdrom-tray-no-device-cap.xml | 32 +++++++++++++++ .../qemuxml2argv-disk-cdrom-tray.args | 10 +++++ .../qemuxml2argv-disk-cdrom-tray.xml | 43 ++++++++++++++++++++ ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 4 ++ ...qemuxml2argv-disk-floppy-tray-no-device-cap.xml | 37 +++++++++++++++++ .../qemuxml2argv-disk-floppy-tray.args | 10 +++++ .../qemuxml2argv-disk-floppy-tray.xml | 37 +++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ 10 files changed, 196 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cddd6aa..60c3d16 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1885,8 +1885,12 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, } /* disk->src is NULL when we use nbd disks */ - if (disk->src || (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && - disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_NBD)) { + if ((disk->src || + (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && + disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_NBD)) && + !((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || + disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) && + disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)) { if (disk->type == VIR_DOMAIN_DISK_TYPE_DIR) { /* QEMU only supports magic FAT format for now */ if (disk->driverType && @@ -4694,7 +4698,13 @@ qemuBuildCommandLine(virConnectPtr conn, } } - virCommandAddArgList(cmd, dev, file, NULL); + /* Don't start with source if the tray is open for + * CDROM and Floppy device. + */ + if (!((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || + disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) && + disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)) + virCommandAddArgList(cmd, dev, file, NULL); VIR_FREE(file); } } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args new file mode 100644 index 0000000..5cd000e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none \ +-serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.xml new file mode 100644 index 0000000..9f891c7 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide' tray='open'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args new file mode 100644 index 0000000..dfa0006 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args @@ -0,0 +1,10 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dc \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-drive if=none,media=cdrom,id=drive-ide0-1-1 \ +-device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ +-usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.xml new file mode 100644 index 0000000..419f8f6 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>test</name> + <uuid>3fa02811-7832-34bd-004d-1ff56a9286ff</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='x86_64' machine='pc-0.13'>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/f14.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> + <target dev='hdc' bus='ide' tray='closed'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/tmp/cdrom.img'/> + <target dev='hdd' bus='ide' tray='open'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='1'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args new file mode 100644 index 0000000..a0aed99 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -fda /dev/fd0 \ +-net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.xml new file mode 100644 index 0000000..1f4dd7f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='floppy'> + <source dev='/dev/fd0'/> + <target dev='fda' bus='fdc' tray='closed'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='floppy'> + <source file='/tmp/firmware.img'/> + <target dev='fdb' bus='fdc' tray='open'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <controller type='usb' index='0'/> + <controller type='fdc' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args new file mode 100644 index 0000000..1a61ea5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args @@ -0,0 +1,10 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0 \ +-global isa-fdc.driveA=drive-fdc0-0-0 \ +-drive if=none,id=drive-fdc0-0-1 \ +-global isa-fdc.driveB=drive-fdc0-0-1 \ +-usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.xml new file mode 100644 index 0000000..1f4dd7f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='floppy'> + <source dev='/dev/fd0'/> + <target dev='fda' bus='fdc' tray='closed'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='floppy'> + <source file='/tmp/firmware.img'/> + <target dev='fdb' bus='fdc' tray='open'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <controller type='usb' index='0'/> + <controller type='fdc' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fcffc27..e304318 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -392,7 +392,13 @@ mymain(void) DO_TEST("hugepages", false, QEMU_CAPS_MEM_PATH); DO_TEST("disk-cdrom", false, NONE); DO_TEST("disk-cdrom-empty", false, QEMU_CAPS_DRIVE); + DO_TEST("disk-cdrom-tray", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_TX_ALG); + DO_TEST("disk-cdrom-tray-no-device-cap", false, NONE); DO_TEST("disk-floppy", false, NONE); + DO_TEST("disk-floppy-tray-no-device-cap", false, NONE); + DO_TEST("disk-floppy-tray", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE); DO_TEST("disk-many", false, NONE); DO_TEST("disk-virtio", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT); DO_TEST("disk-order", false,

With this patch, libvirt won't start the guest with the medium source which already ejected by guest when doing migration, or saving/restoring. --- src/qemu/qemu_process.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 387811a..a75209d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1038,6 +1038,13 @@ qemuProcessHandleTrayMoved(qemuMonitorPtr mon ATTRIBUTE_UNUSED, event = virDomainEventTrayMovedNewFromObj(vm, devAlias, trayOpened); + + /* Update disk tray status */ + disk->tray_status = trayOpened; + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Unable to save status on vm %s after tray moved event", + vm->def->name); + } } virDomainObjUnlock(vm);