]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: process: Fix alias for disk-tray-moved event
authorPeter Krempa <pkrempa@redhat.com>
Mon, 13 Aug 2018 14:11:49 +0000 (16:11 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 21 Aug 2018 13:46:05 +0000 (15:46 +0200)
Currently we'd report the alias of the drive which is backing the cdrom
rather than the device itself:

 $ virsh event ds tray-change --loop
 event 'tray-change' for domain ds disk drive-ide0-0-1: opened
 event 'tray-change' for domain ds disk drive-ide0-0-1: closed

Report the disk device alias as we document in the API docs:

https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventTrayChangeCallback

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_process.c

index b42fda850fd4b3621db535c272c7439073af611a..5d58031c42b951483fa80f44c4ca301176521599 100644 (file)
@@ -1053,9 +1053,7 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
     disk = qemuProcessFindDomainDiskByAlias(vm, devAlias);
 
     if (disk) {
-        event = virDomainEventTrayChangeNewFromObj(vm,
-                                                   devAlias,
-                                                   reason);
+        event = virDomainEventTrayChangeNewFromObj(vm, disk->info.alias, reason);
         /* Update disk tray status */
         if (reason == VIR_DOMAIN_EVENT_TRAY_CHANGE_OPEN)
             disk->tray_status = VIR_DOMAIN_DISK_TRAY_OPEN;