[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/4] qga: Fix an enum conversion warning in comma
From: |
Cao Jiaxi |
Subject: |
[Qemu-devel] [PATCH v2 2/4] qga: Fix an enum conversion warning in commands-win32.c, hit by clang. |
Date: |
Wed, 1 May 2019 02:12:57 +0800 |
Signed-off-by: Cao Jiaxi <address@hidden>
---
qga/commands-win32.c | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index d40d61f605..4cdd2950bf 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -458,23 +458,24 @@ void qmp_guest_file_flush(int64_t handle, Error **errp)
#ifdef CONFIG_QGA_NTDDSCSI
static STORAGE_BUS_TYPE win2qemu[] = {
- [BusTypeUnknown] = GUEST_DISK_BUS_TYPE_UNKNOWN,
- [BusTypeScsi] = GUEST_DISK_BUS_TYPE_SCSI,
- [BusTypeAtapi] = GUEST_DISK_BUS_TYPE_IDE,
- [BusTypeAta] = GUEST_DISK_BUS_TYPE_IDE,
- [BusType1394] = GUEST_DISK_BUS_TYPE_IEEE1394,
- [BusTypeSsa] = GUEST_DISK_BUS_TYPE_SSA,
- [BusTypeFibre] = GUEST_DISK_BUS_TYPE_SSA,
- [BusTypeUsb] = GUEST_DISK_BUS_TYPE_USB,
- [BusTypeRAID] = GUEST_DISK_BUS_TYPE_RAID,
- [BusTypeiScsi] = GUEST_DISK_BUS_TYPE_ISCSI,
- [BusTypeSas] = GUEST_DISK_BUS_TYPE_SAS,
- [BusTypeSata] = GUEST_DISK_BUS_TYPE_SATA,
- [BusTypeSd] = GUEST_DISK_BUS_TYPE_SD,
- [BusTypeMmc] = GUEST_DISK_BUS_TYPE_MMC,
+ [BusTypeUnknown] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_UNKNOWN,
+ [BusTypeScsi] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_SCSI,
+ [BusTypeAtapi] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_IDE,
+ [BusTypeAta] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_IDE,
+ [BusType1394] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_IEEE1394,
+ [BusTypeSsa] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_SSA,
+ [BusTypeFibre] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_SSA,
+ [BusTypeUsb] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_USB,
+ [BusTypeRAID] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_RAID,
+ [BusTypeiScsi] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_ISCSI,
+ [BusTypeSas] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_SAS,
+ [BusTypeSata] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_SATA,
+ [BusTypeSd] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_SD,
+ [BusTypeMmc] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_MMC,
#if (_WIN32_WINNT >= 0x0601)
- [BusTypeVirtual] = GUEST_DISK_BUS_TYPE_VIRTUAL,
- [BusTypeFileBackedVirtual] = GUEST_DISK_BUS_TYPE_FILE_BACKED_VIRTUAL,
+ [BusTypeVirtual] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_VIRTUAL,
+ [BusTypeFileBackedVirtual] =
+ (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_FILE_BACKED_VIRTUAL,
#endif
};
@@ -483,7 +484,7 @@ static GuestDiskBusType find_bus_type(STORAGE_BUS_TYPE bus)
if (bus >= ARRAY_SIZE(win2qemu) || (int)bus < 0) {
return GUEST_DISK_BUS_TYPE_UNKNOWN;
}
- return win2qemu[(int)bus];
+ return (GuestDiskBusType)win2qemu[(int)bus];
}
DEFINE_GUID(GUID_DEVINTERFACE_DISK,
--
2.17.1
- [Qemu-devel] [PATCH v2 2/4] qga: Fix an enum conversion warning in commands-win32.c, hit by clang.,
Cao Jiaxi <=