opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: isolated_device dev_type field not set

Browse Source
This commit is contained in:
Zexi
2019-04-30 13:48:53 +08:00
parent ec21467946
commit e3797b709f
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/isolated_devices.go
+1 -1
View File
@@ -76,7 +76,7 @@ type SIsolatedDevice struct {
HostId string `width:"36" charset:"ascii" nullable:"false" default:"" index:"true" list:"admin" create:"admin_required"` // Column(VARCHAR(36, charset='ascii'), nullable=False, default='', server_default='', index=True)
// # PCI / GPU-HPC / GPU-VGA / USB / NIC
DevType string `width:"16" charset:"ascii" nullable:"false" default:"" index:"true" list:"admin" create:"admin_required"` // Column(VARCHAR(16, charset='ascii'), nullable=False, default='', server_default='', index=True)
DevType string `width:"16" charset:"ascii" nullable:"false" default:"" index:"true" list:"admin" create:"admin_required" update:"admin"` // Column(VARCHAR(16, charset='ascii'), nullable=False, default='', server_default='', index=True)
// # Specific device name read from lspci command, e.g. `Tesla K40m` ...
Model string `width:"32" charset:"ascii" nullable:"false" default:"" index:"true" list:"admin" create:"admin_required" update:"admin"` // Column(VARCHAR(32, charset='ascii'), nullable=False, default='', server_default='', index=True)
pkg/hostman/isolated_device/isolated_device.go
+7 -10
View File
@@ -26,6 +26,7 @@ import (
"yunion.io/x/pkg/util/sets"
"yunion.io/x/pkg/utils"
api "yunion.io/x/onecloud/pkg/apis/compute"
o "yunion.io/x/onecloud/pkg/hostman/options"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/mcclient/modules"
@@ -35,12 +36,6 @@ import (
)
const (
// TODO: merge models/isolated_devices in new file
DIRECT_PCI_TYPE = "PCI"
GPU_HPC_TYPE = "GPU-HPC" // # for compute
GPU_VGA_TYPE = "GPU-VGA" // # for display
USB_TYPE = "USB"
CLASS_CODE_VGA = "0300"
CLASS_CODE_3D = "0302"
)
@@ -381,7 +376,7 @@ type sGPUVGADevice struct {
}
func (gpu *sGPUVGADevice) GetDeviceType() string {
return GPU_VGA_TYPE
return api.GPU_VGA_TYPE
}
func (gpu *sGPUVGADevice) GetVGACmd() string {
@@ -411,13 +406,15 @@ type sGPUHPCDevice struct {
}
func newGPUHPCDevice(dev *PCIDevice) *sGPUHPCDevice {
return &sGPUHPCDevice{
gpuDev := &sGPUHPCDevice{
sGPUBaseDevice: newGPUBaseDevice(dev),
}
gpuDev.devType = gpuDev.GetDeviceType()
return gpuDev
}
func (gpu *sGPUHPCDevice) GetDeviceType() string {
return GPU_HPC_TYPE
return api.GPU_HPC_TYPE
}
func (gpu *sGPUHPCDevice) GetPassthroughCmd(index int) string {
@@ -798,7 +795,7 @@ func getQemuParams(man *IsolatedDeviceManager, devAddrs []string) *QemuParams {
continue
}
devCmds = append(devCmds, GetDeviceCmd(dev, idx))
if dev.GetVGACmd() != vgaCmd && dev.GetDeviceType() == GPU_VGA_TYPE {
if dev.GetVGACmd() != vgaCmd && dev.GetDeviceType() == api.GPU_VGA_TYPE {
vgaCmd = dev.GetVGACmd()
}
if dev.GetCPUCmd() != cpuCmd {