Merge pull request #2066 from devimc/2021-06-17/fixTeardownPmem

runtime: do not hot-remove PMEM devices
This commit is contained in:
Julio Montes 2021-06-22 09:06:59 -05:00 committed by GitHub
commit b9e611e363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1715,6 +1715,11 @@ func (s *Sandbox) HotplugRemoveDevice(ctx context.Context, device api.Device, de
if !ok {
return fmt.Errorf("device type mismatch, expect device type to be %s", devType)
}
// PMEM devices cannot be hot removed
if blockDrive.Pmem {
s.Logger().WithField("path", blockDrive.File).Infof("Skip device: cannot hot remove PMEM devices")
return nil
}
_, err := s.hypervisor.hotplugRemoveDevice(ctx, blockDrive, blockDev)
return err
case config.VhostUserBlk: