From f009e2aae2de342817b47fec6bb1cc32c41ec088 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Fri, 17 Oct 2008 09:24:07 +0000 Subject: [PATCH] =?UTF-8?q?*=20src/qemu=5Fdriver.c:=20fix=20qemudDiskDevic?= =?UTF-8?q?eName=20to=20handle=20disk=20devices=20=20=20too,=20patch=20by?= =?UTF-8?q?=20Guido=20G=C3=BCnther=20daniel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 5 +++++ src/qemu_driver.c | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfc2a9afb7..9d0e8ed974 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 17 11:20:48 CEST 2008 Daniel Veillard + + * src/qemu_driver.c: fix qemudDiskDeviceName to handle disk devices + too, patch by Guido Günther + Fri Oct 17 11:16:30 CEST 2008 Daniel Veillard * src/domain_conf.c: fix virDiskNameToBusDeviceIndex() to allow 0 diff --git a/src/qemu_driver.c b/src/qemu_driver.c index a86b787614..a289e47520 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2342,8 +2342,8 @@ static int qemudDomainUndefine(virDomainPtr dom) { } /* Return the disks name for use in monitor commands */ -static char *qemudDiskDeviceName(virDomainPtr dom, - virDomainDiskDefPtr disk) { +static char *qemudDiskDeviceName(const virDomainPtr dom, + const virDomainDiskDefPtr disk) { int busid, devid; int ret; @@ -2358,10 +2358,16 @@ static char *qemudDiskDeviceName(virDomainPtr dom, switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: - ret = asprintf(&devname, "ide%d-cd%d", busid, devid); + if (disk->device== VIR_DOMAIN_DISK_DEVICE_DISK) + ret = asprintf(&devname, "ide%d-hd%d", busid, devid); + else + ret = asprintf(&devname, "ide%d-cd%d", busid, devid); break; case VIR_DOMAIN_DISK_BUS_SCSI: - ret = asprintf(&devname, "scsi%d-cd%d", busid, devid); + if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) + ret = asprintf(&devname, "scsi%d-hd%d", busid, devid); + else + ret = asprintf(&devname, "scsi%d-cd%d", busid, devid); break; case VIR_DOMAIN_DISK_BUS_FDC: ret = asprintf(&devname, "floppy%d", devid); -- GitLab