diff --git a/Gopkg.lock b/Gopkg.lock index f9a510f9ff..0634bad00a 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -427,7 +427,7 @@ revision = "547a8518098aaa71c5d5d7a370f211e00161016b" [[projects]] - digest = "1:f03425555be45830e86903bba35dd82a1b76e322beff9873e6b888d2b054c217" + digest = "1:ee3d719407ec4bd877eaa4da37e2935298c3d9029ec3c20e502c0e14768b754c" name = "github.com/kata-containers/agent" packages = [ "pkg/types", @@ -435,7 +435,7 @@ "protocols/grpc", ] pruneopts = "NUT" - revision = "e921aa3d0fa39cbd7933c15bd6ae7f0a1d7ab757" + revision = "f9eab0fe9adb34e4f9f4a11f42a3eff983fd0659" [[projects]] digest = "1:58999a98719fddbac6303cb17e8d85b945f60b72f48e3a2df6b950b97fa926f1" diff --git a/Gopkg.toml b/Gopkg.toml index 383c2d92bd..2cdbda4adc 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -52,7 +52,7 @@ [[constraint]] name = "github.com/kata-containers/agent" - revision = "e921aa3d0fa39cbd7933c15bd6ae7f0a1d7ab757" + revision = "f9eab0fe9adb34e4f9f4a11f42a3eff983fd0659" [[constraint]] name = "github.com/containerd/cri-containerd" diff --git a/vendor/github.com/kata-containers/agent/pkg/types/types.pb.go b/vendor/github.com/kata-containers/agent/pkg/types/types.pb.go index a7948049e4..1635e936ab 100644 --- a/vendor/github.com/kata-containers/agent/pkg/types/types.pb.go +++ b/vendor/github.com/kata-containers/agent/pkg/types/types.pb.go @@ -91,10 +91,9 @@ type Interface struct { IPAddresses []*IPAddress `protobuf:"bytes,3,rep,name=IPAddresses" json:"IPAddresses,omitempty"` Mtu uint64 `protobuf:"varint,4,opt,name=mtu,proto3" json:"mtu,omitempty"` HwAddr string `protobuf:"bytes,5,opt,name=hwAddr,proto3" json:"hwAddr,omitempty"` - // pciAddr is the PCI address in the format "bridgeAddr/deviceAddr". - // Here, bridgeAddr is the address at which the bridge is attached on the root bus, - // while deviceAddr is the address at which the network device is attached on the bridge. - PciAddr string `protobuf:"bytes,6,opt,name=pciAddr,proto3" json:"pciAddr,omitempty"` + // pciPath for the device (see type PciPath for format + // details) + PciPath string `protobuf:"bytes,6,opt,name=pciPath,proto3" json:"pciPath,omitempty"` // Type defines the type of interface described by this structure. // The expected values are the one that are defined by the netlink // library, regarding each type of link. Here is a non exhaustive @@ -143,9 +142,9 @@ func (m *Interface) GetHwAddr() string { return "" } -func (m *Interface) GetPciAddr() string { +func (m *Interface) GetPciPath() string { if m != nil { - return m.PciAddr + return m.PciPath } return "" } @@ -352,11 +351,11 @@ func (m *Interface) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(len(m.HwAddr))) i += copy(dAtA[i:], m.HwAddr) } - if len(m.PciAddr) > 0 { + if len(m.PciPath) > 0 { dAtA[i] = 0x32 i++ - i = encodeVarintTypes(dAtA, i, uint64(len(m.PciAddr))) - i += copy(dAtA[i:], m.PciAddr) + i = encodeVarintTypes(dAtA, i, uint64(len(m.PciPath))) + i += copy(dAtA[i:], m.PciPath) } if len(m.Type) > 0 { dAtA[i] = 0x3a @@ -519,7 +518,7 @@ func (m *Interface) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - l = len(m.PciAddr) + l = len(m.PciPath) if l > 0 { n += 1 + l + sovTypes(uint64(l)) } @@ -890,7 +889,7 @@ func (m *Interface) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PciAddr", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PciPath", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -915,7 +914,7 @@ func (m *Interface) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.PciAddr = string(dAtA[iNdEx:postIndex]) + m.PciPath = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 7: if wireType != 2 { @@ -1459,30 +1458,30 @@ func init() { proto.RegisterFile("pkg/types/types.proto", fileDescriptorTypes) } var fileDescriptorTypes = []byte{ // 404 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x41, 0x8a, 0xdb, 0x30, - 0x14, 0x86, 0xab, 0x38, 0xf6, 0xc4, 0x2f, 0x9d, 0xd6, 0x88, 0x76, 0x10, 0x2d, 0x04, 0xe3, 0x4d, - 0x4d, 0x17, 0x53, 0x48, 0x4b, 0xf7, 0xd3, 0xc5, 0x40, 0x36, 0x25, 0xe8, 0x02, 0x45, 0xb1, 0x15, - 0x8f, 0x89, 0x1d, 0x1b, 0x4b, 0x89, 0x09, 0x3d, 0x4b, 0xef, 0xd3, 0x65, 0x8f, 0x10, 0x72, 0x92, - 0xa2, 0x27, 0x39, 0xb8, 0x65, 0x36, 0xf6, 0xfb, 0x9e, 0x24, 0xbf, 0xff, 0xff, 0x2d, 0x78, 0xdb, - 0xee, 0x8a, 0x4f, 0xfa, 0xd4, 0x4a, 0x65, 0x9f, 0xf7, 0x6d, 0xd7, 0xe8, 0x86, 0xfa, 0x08, 0xc9, - 0x06, 0xc2, 0xd5, 0xfa, 0x21, 0xcf, 0x3b, 0xa9, 0x14, 0xfd, 0x00, 0xc1, 0x56, 0xd4, 0x65, 0x75, - 0x62, 0x24, 0x26, 0xe9, 0xab, 0xe5, 0xeb, 0x7b, 0x7b, 0x62, 0xb5, 0x7e, 0xc4, 0x36, 0x77, 0xcb, - 0x94, 0xc1, 0x8d, 0xb0, 0x67, 0xd8, 0x24, 0x26, 0x69, 0xc8, 0x07, 0xa4, 0x14, 0xa6, 0xb5, 0x50, - 0x3b, 0xe6, 0x61, 0x1b, 0xeb, 0xe4, 0x4c, 0x20, 0x5c, 0xed, 0xb5, 0xec, 0xb6, 0x22, 0x93, 0xf4, - 0x0e, 0x82, 0x5c, 0x1e, 0xcb, 0x4c, 0xe2, 0x90, 0x90, 0x3b, 0x32, 0x27, 0xf7, 0xa2, 0x96, 0xee, - 0x83, 0x58, 0xd3, 0x25, 0xcc, 0xaf, 0xea, 0xa4, 0x62, 0x5e, 0xec, 0xa5, 0xf3, 0x65, 0x74, 0x55, - 0xe5, 0x56, 0xf8, 0x78, 0x13, 0x8d, 0xc0, 0xab, 0xf5, 0x81, 0x4d, 0x63, 0x92, 0x4e, 0xb9, 0x29, - 0xcd, 0xc4, 0xa7, 0xde, 0x6c, 0x60, 0xbe, 0x9d, 0x68, 0xc9, 0xb8, 0x68, 0xb3, 0x12, 0x17, 0x02, - 0xeb, 0xc2, 0xa1, 0xd1, 0x62, 0x66, 0xb0, 0x1b, 0xab, 0xc5, 0xd4, 0xf4, 0x3d, 0x84, 0x9d, 0xe8, - 0x7f, 0x6c, 0x2b, 0x51, 0x28, 0x36, 0x8b, 0x49, 0x7a, 0xcb, 0x67, 0x9d, 0xe8, 0x1f, 0x0d, 0x27, - 0x3f, 0xc1, 0xe7, 0xcd, 0x41, 0xa3, 0x8b, 0x5c, 0x2a, 0xed, 0xbc, 0x61, 0x6d, 0xe6, 0x14, 0x42, - 0xcb, 0x5e, 0x9c, 0x86, 0xb4, 0x1c, 0x8e, 0xb2, 0xf0, 0xfe, 0xc9, 0xe2, 0x0e, 0x02, 0xd5, 0x1c, - 0xba, 0x4c, 0xa2, 0x8d, 0x90, 0x3b, 0xa2, 0x6f, 0xc0, 0x57, 0x59, 0xd3, 0x4a, 0x34, 0x72, 0xcb, - 0x2d, 0x24, 0xbf, 0x08, 0xcc, 0x1f, 0xf8, 0xfa, 0xbb, 0x2c, 0x8b, 0xa7, 0x4d, 0xd3, 0x99, 0xd4, - 0x74, 0x73, 0x8d, 0x04, 0xa5, 0x3c, 0x9b, 0xda, 0x68, 0xd3, 0x48, 0xc9, 0xe4, 0x7f, 0x25, 0x55, - 0x65, 0x7e, 0xee, 0xa0, 0xd0, 0x12, 0x2a, 0xd1, 0x42, 0x5b, 0x81, 0x3e, 0xb7, 0x60, 0xba, 0x36, - 0x1f, 0xdf, 0x76, 0x11, 0x3e, 0xbe, 0x83, 0xd9, 0x70, 0x83, 0x68, 0x00, 0x93, 0xe3, 0x97, 0xe8, - 0x05, 0xbe, 0xbf, 0x46, 0xe4, 0xdb, 0xcb, 0xdf, 0x97, 0x05, 0xf9, 0x73, 0x59, 0x90, 0xf3, 0x65, - 0x41, 0x36, 0x01, 0xde, 0xcd, 0xcf, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x99, 0x41, 0x3b, 0x8d, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0xcf, 0xca, 0x9b, 0x40, + 0x14, 0xc5, 0x3b, 0x31, 0xfa, 0xc5, 0x9b, 0xa6, 0x95, 0xa1, 0x0d, 0x43, 0x0b, 0x41, 0xdc, 0x54, + 0xba, 0x48, 0x21, 0x2d, 0xdd, 0xa7, 0x8b, 0x40, 0x36, 0x45, 0xe6, 0x05, 0xca, 0x44, 0x27, 0x46, + 0xa2, 0x51, 0x9c, 0x49, 0x24, 0xf4, 0x59, 0xfa, 0x3e, 0x5d, 0xf6, 0x11, 0x42, 0x9e, 0xa4, 0xcc, + 0x1f, 0x83, 0x2d, 0xdf, 0x46, 0xef, 0xef, 0xce, 0x8c, 0xf7, 0x9c, 0xe3, 0xc0, 0xdb, 0xe6, 0x98, + 0x7f, 0x92, 0xd7, 0x86, 0x0b, 0xf3, 0x5c, 0x36, 0x6d, 0x2d, 0x6b, 0xec, 0x6a, 0x88, 0x76, 0xe0, + 0x6f, 0x93, 0x75, 0x96, 0xb5, 0x5c, 0x08, 0xfc, 0x01, 0xbc, 0x3d, 0xab, 0x8a, 0xf2, 0x4a, 0x50, + 0x88, 0xe2, 0x57, 0xab, 0xd7, 0x4b, 0x73, 0x62, 0x9b, 0x6c, 0x74, 0x9b, 0xda, 0x65, 0x4c, 0xe0, + 0x89, 0x99, 0x33, 0x64, 0x14, 0xa2, 0xd8, 0xa7, 0x3d, 0x62, 0x0c, 0xe3, 0x8a, 0x89, 0x23, 0x71, + 0x74, 0x5b, 0xd7, 0xd1, 0x0d, 0x81, 0xbf, 0x3d, 0x49, 0xde, 0xee, 0x59, 0xca, 0xf1, 0x1c, 0xbc, + 0x8c, 0x5f, 0x8a, 0x94, 0xeb, 0x21, 0x3e, 0xb5, 0xa4, 0x4e, 0x9e, 0x58, 0xc5, 0xed, 0x07, 0x75, + 0x8d, 0x57, 0x30, 0x7d, 0xa8, 0xe3, 0x82, 0x38, 0xa1, 0x13, 0x4f, 0x57, 0xc1, 0x43, 0x95, 0x5d, + 0xa1, 0xc3, 0x4d, 0x38, 0x00, 0xa7, 0x92, 0x67, 0x32, 0x0e, 0x51, 0x3c, 0xa6, 0xaa, 0x54, 0x13, + 0x0f, 0x9d, 0xda, 0x40, 0x5c, 0x33, 0xd1, 0x90, 0x72, 0xd1, 0xa4, 0x45, 0xc2, 0xe4, 0x81, 0x78, + 0xc6, 0x85, 0x45, 0xa5, 0x45, 0xcd, 0x20, 0x4f, 0x46, 0x8b, 0xaa, 0xf1, 0x7b, 0xf0, 0x5b, 0xd6, + 0xfd, 0xd8, 0x97, 0x2c, 0x17, 0x64, 0x12, 0xa2, 0x78, 0x46, 0x27, 0x2d, 0xeb, 0x36, 0x8a, 0xa3, + 0x9f, 0xe0, 0xd2, 0xfa, 0x2c, 0xb5, 0x8b, 0x8c, 0x0b, 0x69, 0xbd, 0xe9, 0x5a, 0xcd, 0xc9, 0x99, + 0xe4, 0x1d, 0xbb, 0xf6, 0x69, 0x59, 0x1c, 0x64, 0xe1, 0xfc, 0x93, 0xc5, 0x1c, 0x3c, 0x51, 0x9f, + 0xdb, 0x94, 0x6b, 0x1b, 0x3e, 0xb5, 0x84, 0xdf, 0x80, 0x2b, 0xd2, 0xba, 0xe1, 0xda, 0xc8, 0x8c, + 0x1a, 0x88, 0x7e, 0x21, 0x98, 0xae, 0x69, 0xf2, 0x9d, 0x17, 0xf9, 0x61, 0x57, 0xb7, 0x2a, 0x35, + 0x59, 0x3f, 0x22, 0xd1, 0x52, 0x9e, 0x4d, 0x6d, 0xb0, 0x69, 0xa0, 0x64, 0xf4, 0xbf, 0x92, 0xb2, + 0x54, 0x3f, 0xb7, 0x57, 0x68, 0x48, 0x2b, 0x91, 0x4c, 0x1a, 0x81, 0x2e, 0x35, 0xa0, 0xba, 0x26, + 0x1f, 0xd7, 0x74, 0x35, 0x7c, 0x7c, 0x07, 0x93, 0xfe, 0x06, 0x61, 0x0f, 0x46, 0x97, 0x2f, 0xc1, + 0x0b, 0xfd, 0xfe, 0x1a, 0xa0, 0x6f, 0x2f, 0x7f, 0xdf, 0x17, 0xe8, 0xcf, 0x7d, 0x81, 0x6e, 0xf7, + 0x05, 0xda, 0x79, 0xfa, 0x6e, 0x7e, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x88, 0xf1, 0xc1, 0x2b, 0xb4, 0x02, 0x00, 0x00, } diff --git a/vendor/github.com/kata-containers/agent/protocols/grpc/agent.pb.go b/vendor/github.com/kata-containers/agent/protocols/grpc/agent.pb.go index 775f313330..6f7b6cf4c1 100644 --- a/vendor/github.com/kata-containers/agent/protocols/grpc/agent.pb.go +++ b/vendor/github.com/kata-containers/agent/protocols/grpc/agent.pb.go @@ -110,10 +110,8 @@ import math "math" import types "github.com/kata-containers/agent/pkg/types" import google_protobuf2 "github.com/gogo/protobuf/types" -import ( - context "golang.org/x/net/context" - grpc1 "google.golang.org/grpc" -) +import context "golang.org/x/net/context" +import grpc1 "google.golang.org/grpc" import io "io" diff --git a/vendor/github.com/kata-containers/agent/protocols/grpc/health.pb.go b/vendor/github.com/kata-containers/agent/protocols/grpc/health.pb.go index 9dd54fbe32..2126ae3259 100644 --- a/vendor/github.com/kata-containers/agent/protocols/grpc/health.pb.go +++ b/vendor/github.com/kata-containers/agent/protocols/grpc/health.pb.go @@ -8,10 +8,8 @@ import fmt "fmt" import math "math" import _ "github.com/gogo/protobuf/gogoproto" -import ( - context "golang.org/x/net/context" - grpc1 "google.golang.org/grpc" -) +import context "golang.org/x/net/context" +import grpc1 "google.golang.org/grpc" import io "io" @@ -110,10 +108,7 @@ func init() { } func (this *CheckRequest) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*CheckRequest) @@ -126,10 +121,7 @@ func (this *CheckRequest) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -140,10 +132,7 @@ func (this *CheckRequest) Equal(that interface{}) bool { } func (this *HealthCheckResponse) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*HealthCheckResponse) @@ -156,10 +145,7 @@ func (this *HealthCheckResponse) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -170,10 +156,7 @@ func (this *HealthCheckResponse) Equal(that interface{}) bool { } func (this *VersionCheckResponse) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*VersionCheckResponse) @@ -186,10 +169,7 @@ func (this *VersionCheckResponse) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } diff --git a/vendor/github.com/kata-containers/agent/protocols/grpc/oci.pb.go b/vendor/github.com/kata-containers/agent/protocols/grpc/oci.pb.go index cbfbab5870..5296a082f2 100644 --- a/vendor/github.com/kata-containers/agent/protocols/grpc/oci.pb.go +++ b/vendor/github.com/kata-containers/agent/protocols/grpc/oci.pb.go @@ -1499,10 +1499,7 @@ func init() { } func (this *Spec) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*Spec) @@ -1515,10 +1512,7 @@ func (this *Spec) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -1566,10 +1560,7 @@ func (this *Spec) Equal(that interface{}) bool { } func (this *Process) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*Process) @@ -1582,10 +1573,7 @@ func (this *Process) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -1644,10 +1632,7 @@ func (this *Process) Equal(that interface{}) bool { } func (this *Box) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*Box) @@ -1660,10 +1645,7 @@ func (this *Box) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -1677,10 +1659,7 @@ func (this *Box) Equal(that interface{}) bool { } func (this *User) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*User) @@ -1693,10 +1672,7 @@ func (this *User) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -1721,10 +1697,7 @@ func (this *User) Equal(that interface{}) bool { } func (this *LinuxCapabilities) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxCapabilities) @@ -1737,10 +1710,7 @@ func (this *LinuxCapabilities) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -1788,10 +1758,7 @@ func (this *LinuxCapabilities) Equal(that interface{}) bool { } func (this *POSIXRlimit) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*POSIXRlimit) @@ -1804,10 +1771,7 @@ func (this *POSIXRlimit) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -1824,10 +1788,7 @@ func (this *POSIXRlimit) Equal(that interface{}) bool { } func (this *Mount) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*Mount) @@ -1840,10 +1801,7 @@ func (this *Mount) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -1868,10 +1826,7 @@ func (this *Mount) Equal(that interface{}) bool { } func (this *Root) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*Root) @@ -1884,10 +1839,7 @@ func (this *Root) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -1901,10 +1853,7 @@ func (this *Root) Equal(that interface{}) bool { } func (this *Hooks) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*Hooks) @@ -1917,10 +1866,7 @@ func (this *Hooks) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -1952,10 +1898,7 @@ func (this *Hooks) Equal(that interface{}) bool { } func (this *Hook) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*Hook) @@ -1968,10 +1911,7 @@ func (this *Hook) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2001,10 +1941,7 @@ func (this *Hook) Equal(that interface{}) bool { } func (this *Linux) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*Linux) @@ -2017,10 +1954,7 @@ func (this *Linux) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2102,10 +2036,7 @@ func (this *Linux) Equal(that interface{}) bool { } func (this *Windows) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*Windows) @@ -2118,10 +2049,7 @@ func (this *Windows) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2132,10 +2060,7 @@ func (this *Windows) Equal(that interface{}) bool { } func (this *Solaris) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*Solaris) @@ -2148,10 +2073,7 @@ func (this *Solaris) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2162,10 +2084,7 @@ func (this *Solaris) Equal(that interface{}) bool { } func (this *LinuxIDMapping) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxIDMapping) @@ -2178,10 +2097,7 @@ func (this *LinuxIDMapping) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2198,10 +2114,7 @@ func (this *LinuxIDMapping) Equal(that interface{}) bool { } func (this *LinuxNamespace) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxNamespace) @@ -2214,10 +2127,7 @@ func (this *LinuxNamespace) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2231,10 +2141,7 @@ func (this *LinuxNamespace) Equal(that interface{}) bool { } func (this *LinuxDevice) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxDevice) @@ -2247,10 +2154,7 @@ func (this *LinuxDevice) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2279,10 +2183,7 @@ func (this *LinuxDevice) Equal(that interface{}) bool { } func (this *LinuxResources) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxResources) @@ -2295,10 +2196,7 @@ func (this *LinuxResources) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2337,10 +2235,7 @@ func (this *LinuxResources) Equal(that interface{}) bool { } func (this *LinuxMemory) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxMemory) @@ -2353,10 +2248,7 @@ func (this *LinuxMemory) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2385,10 +2277,7 @@ func (this *LinuxMemory) Equal(that interface{}) bool { } func (this *LinuxCPU) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxCPU) @@ -2401,10 +2290,7 @@ func (this *LinuxCPU) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2433,10 +2319,7 @@ func (this *LinuxCPU) Equal(that interface{}) bool { } func (this *LinuxWeightDevice) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxWeightDevice) @@ -2449,10 +2332,7 @@ func (this *LinuxWeightDevice) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2472,10 +2352,7 @@ func (this *LinuxWeightDevice) Equal(that interface{}) bool { } func (this *LinuxThrottleDevice) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxThrottleDevice) @@ -2488,10 +2365,7 @@ func (this *LinuxThrottleDevice) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2508,10 +2382,7 @@ func (this *LinuxThrottleDevice) Equal(that interface{}) bool { } func (this *LinuxBlockIO) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxBlockIO) @@ -2524,10 +2395,7 @@ func (this *LinuxBlockIO) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2581,10 +2449,7 @@ func (this *LinuxBlockIO) Equal(that interface{}) bool { } func (this *LinuxPids) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxPids) @@ -2597,10 +2462,7 @@ func (this *LinuxPids) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2611,10 +2473,7 @@ func (this *LinuxPids) Equal(that interface{}) bool { } func (this *LinuxDeviceCgroup) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxDeviceCgroup) @@ -2627,10 +2486,7 @@ func (this *LinuxDeviceCgroup) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2653,10 +2509,7 @@ func (this *LinuxDeviceCgroup) Equal(that interface{}) bool { } func (this *LinuxNetwork) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxNetwork) @@ -2669,10 +2522,7 @@ func (this *LinuxNetwork) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2691,10 +2541,7 @@ func (this *LinuxNetwork) Equal(that interface{}) bool { } func (this *LinuxHugepageLimit) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxHugepageLimit) @@ -2707,10 +2554,7 @@ func (this *LinuxHugepageLimit) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2724,10 +2568,7 @@ func (this *LinuxHugepageLimit) Equal(that interface{}) bool { } func (this *LinuxInterfacePriority) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxInterfacePriority) @@ -2740,10 +2581,7 @@ func (this *LinuxInterfacePriority) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2757,10 +2595,7 @@ func (this *LinuxInterfacePriority) Equal(that interface{}) bool { } func (this *LinuxSeccomp) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxSeccomp) @@ -2773,10 +2608,7 @@ func (this *LinuxSeccomp) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2803,10 +2635,7 @@ func (this *LinuxSeccomp) Equal(that interface{}) bool { } func (this *LinuxSeccompArg) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxSeccompArg) @@ -2819,10 +2648,7 @@ func (this *LinuxSeccompArg) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2842,10 +2668,7 @@ func (this *LinuxSeccompArg) Equal(that interface{}) bool { } func (this *LinuxSyscall) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxSyscall) @@ -2858,10 +2681,7 @@ func (this *LinuxSyscall) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } @@ -2888,10 +2708,7 @@ func (this *LinuxSyscall) Equal(that interface{}) bool { } func (this *LinuxIntelRdt) Equal(that interface{}) bool { if that == nil { - if this == nil { - return true - } - return false + return this == nil } that1, ok := that.(*LinuxIntelRdt) @@ -2904,10 +2721,7 @@ func (this *LinuxIntelRdt) Equal(that interface{}) bool { } } if that1 == nil { - if this == nil { - return true - } - return false + return this == nil } else if this == nil { return false } diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go index 5767e66bea..e897a2cca1 100644 --- a/virtcontainers/kata_agent.go +++ b/virtcontainers/kata_agent.go @@ -2297,7 +2297,7 @@ func (k *kataAgent) convertToKataAgentInterface(iface *vcTypes.Interface) *aType Mtu: iface.Mtu, RawFlags: iface.RawFlags, HwAddr: iface.HwAddr, - PciAddr: iface.PciAddr, + PciPath: iface.PciAddr, } } @@ -2313,7 +2313,7 @@ func (k *kataAgent) convertToInterfaces(aIfaces []*aTypes.Interface) (ifaces []* IPAddresses: k.convertToIPAddresses(aIface.IPAddresses), Mtu: aIface.Mtu, HwAddr: aIface.HwAddr, - PciAddr: aIface.PciAddr, + PciAddr: aIface.PciPath, } ifaces = append(ifaces, iface)