github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-02 09:24:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2571 from jcvenegas/caps-clh

Browse Source 
clh:  Implment capabilities
This commit is contained in:
Jose Carlos Venegas Munoz
2020-03-30 16:33:42 -06:00
committed by GitHub
parent 9fd7189388 39e354f609
commit 705713b4f9
7 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
virtcontainers/acrn_arch_base.go
View File

@@ -360,8 +360,6 @@ func (a *acrnArchBase) memoryTopology(memoryMb uint64) Memory {
func (a *acrnArchBase) capabilities() types.Capabilities { func (a *acrnArchBase) capabilities() types.Capabilities {
var caps types.Capabilities var caps types.Capabilities
// For devicemapper disable support for filesystem sharing
caps.SetFsSharingUnsupported()
caps.SetBlockDeviceSupport() caps.SetBlockDeviceSupport()
caps.SetBlockDeviceHotplugSupport() caps.SetBlockDeviceHotplugSupport()

2
virtcontainers/clh.go
View File

@@ -643,8 +643,8 @@ func (clh *cloudHypervisor) capabilities() types.Capabilities {
clh.Logger().WithField("function", "capabilities").Info("get Capabilities") clh.Logger().WithField("function", "capabilities").Info("get Capabilities")
var caps types.Capabilities var caps types.Capabilities
caps.SetFsSharingSupport()
return caps return caps
} }
func (clh *cloudHypervisor) trace(name string) (opentracing.Span, context.Context) { func (clh *cloudHypervisor) trace(name string) (opentracing.Span, context.Context) {

1
virtcontainers/fc.go
View File

@@ -1065,7 +1065,6 @@ func (fc *firecracker) capabilities() types.Capabilities {
span, _ := fc.trace("capabilities") span, _ := fc.trace("capabilities")
defer span.Finish() defer span.Finish()
var caps types.Capabilities var caps types.Capabilities
caps.SetFsSharingUnsupported()
caps.SetBlockDeviceHotplugSupport() caps.SetBlockDeviceHotplugSupport()
return caps return caps

1
virtcontainers/qemu_amd64.go
View File

@@ -119,6 +119,7 @@ func (q *qemuAmd64) capabilities() types.Capabilities {
} }
caps.SetMultiQueueSupport() caps.SetMultiQueueSupport()
caps.SetFsSharingSupport()
return caps return caps
} }

1
virtcontainers/qemu_arch_base.go
View File

@@ -271,6 +271,7 @@ func (q *qemuArchBase) capabilities() types.Capabilities {
var caps types.Capabilities var caps types.Capabilities
caps.SetBlockDeviceHotplugSupport() caps.SetBlockDeviceHotplugSupport()
caps.SetMultiQueueSupport() caps.SetMultiQueueSupport()
caps.SetFsSharingSupport()
return caps return caps
} }

8
virtcontainers/types/capabilities.go
View File

@@ -9,7 +9,7 @@ const (
blockDeviceSupport = 1 << iota blockDeviceSupport = 1 << iota
blockDeviceHotplugSupport blockDeviceHotplugSupport
multiQueueSupport multiQueueSupport
fsSharingUnsupported fsSharingSupported
) )
// Capabilities describe a virtcontainers hypervisor capabilities // Capabilities describe a virtcontainers hypervisor capabilities
@@ -50,10 +50,10 @@ func (caps *Capabilities) SetMultiQueueSupport() {
// IsFsSharingSupported tells if an hypervisor supports host filesystem sharing. // IsFsSharingSupported tells if an hypervisor supports host filesystem sharing.
func (caps *Capabilities) IsFsSharingSupported() bool { func (caps *Capabilities) IsFsSharingSupported() bool {
return caps.flags&fsSharingUnsupported == 0 return caps.flags&fsSharingSupported != 0
} }
// SetFsSharingUnsupported sets the host filesystem sharing capability to true. // SetFsSharingUnsupported sets the host filesystem sharing capability to true.
func (caps *Capabilities) SetFsSharingUnsupported() { func (caps *Capabilities) SetFsSharingSupport() {
caps.flags |= fsSharingUnsupported caps.flags |= fsSharingSupported
} }

4
virtcontainers/types/capabilities_test.go
View File

@@ -30,7 +30,7 @@ func TestBlockDeviceHotplugCapability(t *testing.T) {
func TestFsSharingCapability(t *testing.T) { func TestFsSharingCapability(t *testing.T) {
var caps Capabilities var caps Capabilities
assert.True(t, caps.IsFsSharingSupported())
caps.SetFsSharingUnsupported()
assert.False(t, caps.IsFsSharingSupported()) assert.False(t, caps.IsFsSharingSupported())
caps.SetFsSharingSupport()
assert.True(t, caps.IsFsSharingSupported())
} }