vendor: fix govmm package

Last time govmm was updated it was not vendored correctly

Fixes #797

Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
Julio Montes 2018-09-28 10:36:13 -05:00
parent a786643d0b
commit f4cf2137be
3 changed files with 7 additions and 6 deletions

4
Gopkg.lock generated
View File

@ -123,7 +123,7 @@
revision = "3520598351bb3500a49ae9563f5539666ae0a27c" revision = "3520598351bb3500a49ae9563f5539666ae0a27c"
[[projects]] [[projects]]
digest = "1:2b062c3645f86b71bdb0487b4d69746704695fc09158fe4638c213d38c6cc5dc" digest = "1:034b5648db9f53a2b6f4f84925ee031cbeaba69daa10d95e74e8242707d7a5b0"
name = "github.com/intel/govmm" name = "github.com/intel/govmm"
packages = ["qemu"] packages = ["qemu"]
pruneopts = "NUT" pruneopts = "NUT"
@ -428,6 +428,8 @@
"golang.org/x/net/context", "golang.org/x/net/context",
"golang.org/x/sys/unix", "golang.org/x/sys/unix",
"google.golang.org/grpc", "google.golang.org/grpc",
"google.golang.org/grpc/codes",
"google.golang.org/grpc/status",
] ]
solver-name = "gps-cdcl" solver-name = "gps-cdcl"
solver-version = 1 solver-version = 1

View File

@ -49,8 +49,7 @@ func CreateCloudInitISO(ctx context.Context, scratchDir, isoPath string,
_ = os.RemoveAll(configDrivePath) _ = os.RemoveAll(configDrivePath)
}() }()
/* #nosec */ err := os.MkdirAll(dataDirPath, 0750)
err := os.MkdirAll(dataDirPath, 0755)
if err != nil { if err != nil {
return fmt.Errorf("Unable to create config drive directory %s : %v", return fmt.Errorf("Unable to create config drive directory %s : %v",
dataDirPath, err) dataDirPath, err)

View File

@ -937,10 +937,10 @@ func (q *QMP) ExecutePCIVFIODeviceAdd(ctx context.Context, devID, bdf, addr, bus
} }
// ExecutePCIVFIOMediatedDeviceAdd adds a VFIO mediated device to a QEMU instance using the device_add command. // ExecutePCIVFIOMediatedDeviceAdd adds a VFIO mediated device to a QEMU instance using the device_add command.
// This function can be used to hot plug VFIO mediated devices on PCI(E) bridges, unlike // This function can be used to hot plug VFIO mediated devices on PCI(E) bridges or root bus, unlike
// ExecuteVFIODeviceAdd this function receives the bus and the device address on its parent bus. // ExecuteVFIODeviceAdd this function receives the bus and the device address on its parent bus.
// bus is optional. devID is the id of the device to add. Must be valid QMP identifier. sysfsdev is the VFIO // devID is the id of the device to add. Must be valid QMP identifier. sysfsdev is the VFIO mediated device.
// mediated device. // Both bus and addr are optional. If they are both set to be empty, the system will pick up an empty slot on root bus.
func (q *QMP) ExecutePCIVFIOMediatedDeviceAdd(ctx context.Context, devID, sysfsdev, addr, bus string) error { func (q *QMP) ExecutePCIVFIOMediatedDeviceAdd(ctx context.Context, devID, sysfsdev, addr, bus string) error {
args := map[string]interface{}{ args := map[string]interface{}{
"id": devID, "id": devID,