diff --git a/proto/types.pb.go b/proto/types.pb.go index 63e5a8c47..f1263e153 100644 --- a/proto/types.pb.go +++ b/proto/types.pb.go @@ -433,14 +433,14 @@ func (m *IPConfiguration) GetNameservers() []string { // Message to set the machine config for a Firecracker VM type FirecrackerMachineConfiguration struct { - CPUTemplate string `protobuf:"bytes,1,opt,name=CPUTemplate,proto3" json:"CPUTemplate,omitempty"` - HtEnabled bool `protobuf:"varint,2,opt,name=HtEnabled,proto3" json:"HtEnabled,omitempty"` - TrackDirtyPages bool `protobuf:"varint,3,opt,name=TrackDirtyPages,proto3" json:"TrackDirtyPages,omitempty"` + CPUTemplate string `protobuf:"bytes,1,opt,name=CPUTemplate,proto3" json:"CPUTemplate,omitempty"` + HtEnabled bool `protobuf:"varint,2,opt,name=HtEnabled,proto3" json:"HtEnabled,omitempty"` // Specifies the memory size of VM // This lets us create a Firecracker VM of up to 4096 TiB, which // for a microVM should be large enough - MemSizeMib uint32 `protobuf:"varint,4,opt,name=MemSizeMib,proto3" json:"MemSizeMib,omitempty"` - VcpuCount uint32 `protobuf:"varint,5,opt,name=VcpuCount,proto3" json:"VcpuCount,omitempty"` + MemSizeMib uint32 `protobuf:"varint,3,opt,name=MemSizeMib,proto3" json:"MemSizeMib,omitempty"` + VcpuCount uint32 `protobuf:"varint,4,opt,name=VcpuCount,proto3" json:"VcpuCount,omitempty"` + TrackDirtyPages bool `protobuf:"varint,5,opt,name=TrackDirtyPages,proto3" json:"TrackDirtyPages,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -484,13 +484,6 @@ func (m *FirecrackerMachineConfiguration) GetHtEnabled() bool { return false } -func (m *FirecrackerMachineConfiguration) GetTrackDirtyPages() bool { - if m != nil { - return m.TrackDirtyPages - } - return false -} - func (m *FirecrackerMachineConfiguration) GetMemSizeMib() uint32 { if m != nil { return m.MemSizeMib @@ -505,6 +498,13 @@ func (m *FirecrackerMachineConfiguration) GetVcpuCount() uint32 { return 0 } +func (m *FirecrackerMachineConfiguration) GetTrackDirtyPages() bool { + if m != nil { + return m.TrackDirtyPages + } + return false +} + // Message to specify the block device config for a Firecracker VM type FirecrackerRootDrive struct { // (Required) HostPath is the path on the host to the filesystem image or device @@ -845,62 +845,62 @@ func init() { func init() { proto.RegisterFile("types.proto", fileDescriptor_d938547f84707355) } var fileDescriptor_d938547f84707355 = []byte{ - // 905 bytes of a gzipped FileDescriptorProto + // 908 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x6e, 0x23, 0x35, 0x14, 0xd6, 0x74, 0x9a, 0x6e, 0xe2, 0x74, 0x77, 0x8b, 0xd5, 0x5d, 0x42, 0x17, 0x41, 0x34, 0x42, 0x28, 0x48, 0xab, 0x14, 0x95, 0x1f, 0x89, 0x0b, 0xb4, 0xca, 0xcf, 0x2e, 0x1b, 0x20, 0x4d, 0xe4, 0x84, 0x22, 0x71, 0xe7, 0x4e, 0x4e, 0x52, 0xab, 0x33, 0x76, 0xe4, 0xf1, 0x24, 0x3b, 0xfb, 0x08, 0x88, 0x2b, 0xde, 0x82, 0x0b, 0x1e, 0x81, 0x07, 0xe0, 0x4d, 0x78, 0x0c, 0x64, 0x8f, 0x67, 0xe2, - 0xcc, 0x96, 0x8a, 0xab, 0xe4, 0x7c, 0xdf, 0x67, 0x9f, 0x5f, 0x9f, 0x41, 0x4d, 0x95, 0xad, 0x21, - 0xe9, 0xae, 0xa5, 0x50, 0xe2, 0xec, 0x83, 0x95, 0x10, 0xab, 0x08, 0xce, 0x8d, 0x75, 0x9d, 0x2e, - 0xcf, 0x29, 0xcf, 0x72, 0x2a, 0xf8, 0xcb, 0x43, 0x8d, 0x97, 0x6f, 0x94, 0xa4, 0x43, 0xaa, 0x28, - 0x3e, 0x43, 0xf5, 0xef, 0x13, 0xc1, 0x67, 0x6b, 0x08, 0x5b, 0x5e, 0xdb, 0xeb, 0x1c, 0x93, 0xd2, - 0xc6, 0x5f, 0xa3, 0x26, 0x49, 0x79, 0x38, 0x59, 0x2b, 0x26, 0x78, 0xd2, 0x3a, 0x68, 0x7b, 0x9d, - 0xe6, 0xc5, 0x69, 0x37, 0xbf, 0xba, 0x5b, 0x5c, 0xdd, 0xed, 0xf1, 0x8c, 0xb8, 0x42, 0xfc, 0x21, - 0x6a, 0xcc, 0xd4, 0x82, 0xf1, 0xa9, 0x90, 0xaa, 0xe5, 0xb7, 0xbd, 0xce, 0x43, 0xb2, 0x03, 0xf0, - 0x47, 0x08, 0xcd, 0xd4, 0x42, 0xa4, 0xca, 0xd0, 0x87, 0x86, 0x76, 0x10, 0xcb, 0x83, 0x94, 0x86, - 0xaf, 0x95, 0xbc, 0x45, 0x82, 0x3f, 0x0f, 0xd0, 0xb3, 0x57, 0x4c, 0x42, 0x28, 0x69, 0x78, 0x0b, - 0xf2, 0x12, 0xd4, 0x56, 0xc8, 0xdb, 0x11, 0x57, 0x20, 0x97, 0x34, 0x04, 0xed, 0xbd, 0x17, 0x45, - 0x62, 0x3b, 0x1e, 0x0f, 0x67, 0x26, 0xa5, 0x3a, 0xd9, 0x01, 0xf8, 0x5b, 0xf4, 0x70, 0xc4, 0x09, - 0x55, 0xf0, 0x23, 0x8b, 0x99, 0x02, 0x69, 0xb3, 0x7a, 0xbf, 0xeb, 0x5c, 0xe9, 0xd0, 0x64, 0x5f, - 0x8d, 0x5f, 0xa0, 0x47, 0x93, 0x54, 0xb9, 0xe7, 0xfd, 0xfb, 0xcf, 0x57, 0xe4, 0xf8, 0x1c, 0x35, - 0x06, 0x97, 0xa3, 0x81, 0xe0, 0x4b, 0xb6, 0x32, 0xc9, 0x37, 0x2f, 0xde, 0xeb, 0x96, 0x48, 0x2a, - 0xa9, 0x2e, 0x21, 0xd9, 0x69, 0xf0, 0x0b, 0x74, 0x3c, 0x53, 0x54, 0xb1, 0xd0, 0x9e, 0xa9, 0x99, - 0x33, 0xcf, 0xba, 0x39, 0x68, 0xb3, 0xdf, 0x3f, 0xbd, 0x77, 0x20, 0xf8, 0xf5, 0x00, 0x9d, 0x54, - 0x1d, 0xe0, 0x36, 0x6a, 0xda, 0xa3, 0x97, 0x34, 0x06, 0x53, 0xa6, 0x06, 0x71, 0x21, 0xfc, 0x89, - 0x2e, 0x94, 0xad, 0xa9, 0xd1, 0x1c, 0x18, 0xcd, 0x3e, 0x88, 0x5b, 0xe8, 0x41, 0x9f, 0xf1, 0x29, - 0x55, 0x37, 0x2d, 0xbf, 0xed, 0x77, 0x1a, 0xa4, 0x30, 0x35, 0xa3, 0x5d, 0x0e, 0x99, 0x34, 0x69, - 0x36, 0x48, 0x61, 0xea, 0x91, 0x1b, 0xd0, 0xf0, 0x06, 0x34, 0x55, 0x33, 0x54, 0x69, 0xe3, 0xe7, - 0xe8, 0xb0, 0x27, 0x57, 0x49, 0xeb, 0xa8, 0xed, 0x77, 0x9a, 0x17, 0xad, 0x77, 0x2a, 0xa3, 0x81, - 0x9e, 0x5c, 0x11, 0xa3, 0x3a, 0xfb, 0x1c, 0x1d, 0xe5, 0x36, 0x3e, 0x41, 0xfe, 0x0f, 0x90, 0xd9, - 0x3c, 0xf4, 0x5f, 0x7c, 0x8a, 0x6a, 0x57, 0x34, 0x4a, 0x8b, 0xb8, 0x73, 0x23, 0xf8, 0xcd, 0x43, - 0x67, 0xff, 0x5d, 0x39, 0x3d, 0x7b, 0x63, 0x1a, 0xf6, 0x16, 0x0b, 0x09, 0x49, 0x62, 0x6f, 0x73, - 0x10, 0x5d, 0xb6, 0xd7, 0x22, 0x51, 0x43, 0xd8, 0x38, 0x25, 0x71, 0x21, 0xfc, 0x1c, 0xd5, 0x47, - 0x53, 0xdb, 0xaa, 0x7c, 0x34, 0x4e, 0xba, 0x05, 0x50, 0xf4, 0xa7, 0x54, 0x04, 0x5b, 0xf4, 0xb8, - 0x42, 0x6a, 0x17, 0x53, 0xc9, 0x62, 0x2a, 0x33, 0xed, 0xb4, 0xe8, 0x8c, 0x03, 0x69, 0xc5, 0x77, - 0x54, 0xc1, 0x96, 0xe6, 0x0a, 0x3f, 0x57, 0x38, 0x90, 0xe9, 0x2e, 0x8d, 0x21, 0x01, 0xb9, 0x01, - 0x99, 0xb4, 0x0e, 0x4d, 0x67, 0x5c, 0x28, 0xf8, 0xdb, 0x43, 0x1f, 0x3b, 0x13, 0x3b, 0xa6, 0xe1, - 0x0d, 0xe3, 0xf0, 0x4e, 0x24, 0x83, 0xe9, 0x4f, 0x73, 0x88, 0xd7, 0x11, 0x55, 0xe5, 0x8c, 0x38, - 0x90, 0x7e, 0x6a, 0xaf, 0xd5, 0x4b, 0x4e, 0xaf, 0x23, 0x58, 0x98, 0x62, 0xd4, 0xc9, 0x0e, 0xc0, - 0x1d, 0xf4, 0x78, 0xae, 0xaf, 0x1f, 0x32, 0xa9, 0xb2, 0x29, 0x5d, 0x41, 0x62, 0x62, 0xad, 0x93, - 0x2a, 0x6c, 0xca, 0x0e, 0xf1, 0x8c, 0xbd, 0x85, 0x31, 0xbb, 0x2e, 0x56, 0xc2, 0x0e, 0xd1, 0x7e, - 0xae, 0xc2, 0x75, 0x3a, 0x10, 0x29, 0x2f, 0x36, 0xc2, 0x0e, 0x08, 0xfe, 0xf0, 0xd0, 0xa9, 0xfb, - 0xfa, 0x84, 0x50, 0x43, 0xc9, 0x36, 0xa0, 0x07, 0x4d, 0xb7, 0xc6, 0x4c, 0x67, 0x1e, 0x7d, 0x69, - 0x6b, 0x6e, 0x4a, 0xa5, 0x4a, 0x53, 0xb6, 0xb0, 0x6d, 0x2c, 0x6d, 0x1d, 0xce, 0x28, 0xf9, 0x59, - 0x32, 0xa5, 0xf3, 0xb0, 0x31, 0x3b, 0x08, 0xfe, 0x06, 0x35, 0xdd, 0x0d, 0x70, 0x78, 0xff, 0x06, - 0x70, 0xb5, 0xc1, 0x3f, 0x1e, 0x7a, 0xe2, 0xe8, 0x4c, 0x9c, 0x63, 0x9d, 0xc5, 0xbd, 0xc1, 0x3e, - 0x45, 0x47, 0x57, 0x63, 0xc3, 0xe4, 0xa1, 0x5a, 0x0b, 0x7f, 0x8a, 0x1e, 0xbd, 0x62, 0x11, 0x24, - 0x59, 0xa2, 0x20, 0x9e, 0x67, 0x6b, 0xb0, 0xc3, 0x50, 0x41, 0xf5, 0x5b, 0x2c, 0x96, 0x78, 0x3e, - 0x0b, 0x85, 0x59, 0x4d, 0xa5, 0xf6, 0xff, 0x53, 0xa9, 0x54, 0xe9, 0xa8, 0x5a, 0xa5, 0xe0, 0x2d, - 0x7a, 0x7a, 0xf7, 0x35, 0xf8, 0x2b, 0xd4, 0xe8, 0x53, 0xbe, 0xd8, 0xb2, 0x85, 0xcd, 0xb5, 0xe2, - 0x72, 0x2e, 0x6e, 0x81, 0xf7, 0xd3, 0xf0, 0x16, 0x14, 0xd9, 0x29, 0xf1, 0x67, 0xc8, 0x9f, 0xac, - 0x93, 0xbb, 0x16, 0xb6, 0x7b, 0x40, 0x6b, 0x82, 0x37, 0x7b, 0xbe, 0x1d, 0x1a, 0x07, 0xe8, 0x78, - 0xc2, 0x61, 0xce, 0x62, 0xe8, 0xa7, 0x32, 0x51, 0xc6, 0xbd, 0x4f, 0xf6, 0x30, 0x9d, 0x19, 0x81, - 0x25, 0x8b, 0x22, 0x0d, 0x19, 0x7f, 0x3e, 0x71, 0x90, 0x7c, 0x81, 0xad, 0x69, 0xc8, 0x54, 0x66, - 0x0a, 0xee, 0x93, 0xd2, 0x0e, 0x7e, 0xf7, 0x50, 0xcb, 0x71, 0xdd, 0xa7, 0x51, 0x24, 0x04, 0x1f, - 0xc2, 0x86, 0xd9, 0x4f, 0x53, 0xac, 0xbb, 0xad, 0xc7, 0x3c, 0xf7, 0xbc, 0x03, 0x74, 0x68, 0x43, - 0x58, 0xea, 0x87, 0x35, 0xe1, 0x13, 0x11, 0xdb, 0x07, 0xb5, 0x87, 0xe1, 0x2f, 0xd1, 0x13, 0xbd, - 0xbe, 0x92, 0xa9, 0x88, 0x22, 0xc6, 0x57, 0x66, 0x19, 0x6f, 0x68, 0x94, 0xd8, 0x38, 0xee, 0x26, - 0xfb, 0x0f, 0x7e, 0xa9, 0xe5, 0x5f, 0xeb, 0x23, 0xf3, 0xf3, 0xc5, 0xbf, 0x01, 0x00, 0x00, 0xff, - 0xff, 0xef, 0xbc, 0x7b, 0x82, 0x2c, 0x08, 0x00, 0x00, + 0xcc, 0x96, 0x8a, 0xab, 0xe4, 0x7c, 0xdf, 0x77, 0x7c, 0x7e, 0x7c, 0x7c, 0x06, 0x35, 0x55, 0xb6, + 0x86, 0xa4, 0xbb, 0x96, 0x42, 0x89, 0xb3, 0x0f, 0x56, 0x42, 0xac, 0x22, 0x38, 0x37, 0xd6, 0x75, + 0xba, 0x3c, 0xa7, 0x3c, 0xcb, 0xa9, 0xe0, 0x2f, 0x0f, 0x35, 0x5e, 0xbe, 0x51, 0x92, 0x0e, 0xa9, + 0xa2, 0xf8, 0x0c, 0xd5, 0xbf, 0x4f, 0x04, 0x9f, 0xad, 0x21, 0x6c, 0x79, 0x6d, 0xaf, 0x73, 0x4c, + 0x4a, 0x1b, 0x7f, 0x8d, 0x9a, 0x24, 0xe5, 0xe1, 0x64, 0xad, 0x98, 0xe0, 0x49, 0xeb, 0xa0, 0xed, + 0x75, 0x9a, 0x17, 0xa7, 0xdd, 0xfc, 0xe8, 0x6e, 0x71, 0x74, 0xb7, 0xc7, 0x33, 0xe2, 0x0a, 0xf1, + 0x87, 0xa8, 0x31, 0x53, 0x0b, 0xc6, 0xa7, 0x42, 0xaa, 0x96, 0xdf, 0xf6, 0x3a, 0x0f, 0xc9, 0x0e, + 0xc0, 0x1f, 0x21, 0x34, 0x53, 0x0b, 0x91, 0x2a, 0x43, 0x1f, 0x1a, 0xda, 0x41, 0x2c, 0x0f, 0x52, + 0x1a, 0xbe, 0x56, 0xf2, 0x16, 0x09, 0xfe, 0x3c, 0x40, 0xcf, 0x5e, 0x31, 0x09, 0xa1, 0xa4, 0xe1, + 0x2d, 0xc8, 0x4b, 0x50, 0x5b, 0x21, 0x6f, 0x47, 0x5c, 0x81, 0x5c, 0xd2, 0x10, 0x74, 0xf4, 0x5e, + 0x14, 0x89, 0xed, 0x78, 0x3c, 0x9c, 0x99, 0x92, 0xea, 0x64, 0x07, 0xe0, 0x6f, 0xd1, 0xc3, 0x11, + 0x27, 0x54, 0xc1, 0x8f, 0x2c, 0x66, 0x0a, 0xa4, 0xad, 0xea, 0xfd, 0xae, 0x73, 0xa4, 0x43, 0x93, + 0x7d, 0x35, 0x7e, 0x81, 0x1e, 0x4d, 0x52, 0xe5, 0xfa, 0xfb, 0xf7, 0xfb, 0x57, 0xe4, 0xf8, 0x1c, + 0x35, 0x06, 0x97, 0xa3, 0x81, 0xe0, 0x4b, 0xb6, 0x32, 0xc5, 0x37, 0x2f, 0xde, 0xeb, 0x96, 0x48, + 0x2a, 0xa9, 0x6e, 0x21, 0xd9, 0x69, 0xf0, 0x0b, 0x74, 0x3c, 0x53, 0x54, 0xb1, 0xd0, 0xfa, 0xd4, + 0x8c, 0xcf, 0xb3, 0x6e, 0x0e, 0xda, 0xea, 0xf7, 0xbd, 0xf7, 0x1c, 0x82, 0x5f, 0x0f, 0xd0, 0x49, + 0x35, 0x00, 0x6e, 0xa3, 0xa6, 0x75, 0xbd, 0xa4, 0x31, 0x98, 0x36, 0x35, 0x88, 0x0b, 0xe1, 0x4f, + 0x74, 0xa3, 0x6c, 0x4f, 0x8d, 0xe6, 0xc0, 0x68, 0xf6, 0x41, 0xdc, 0x42, 0x0f, 0xfa, 0x8c, 0x4f, + 0xa9, 0xba, 0x69, 0xf9, 0x6d, 0xbf, 0xd3, 0x20, 0x85, 0xa9, 0x19, 0x1d, 0x72, 0xc8, 0xa4, 0x29, + 0xb3, 0x41, 0x0a, 0x53, 0x8f, 0xdc, 0x80, 0x86, 0x37, 0xa0, 0xa9, 0x9a, 0xa1, 0x4a, 0x1b, 0x3f, + 0x47, 0x87, 0x3d, 0xb9, 0x4a, 0x5a, 0x47, 0x6d, 0xbf, 0xd3, 0xbc, 0x68, 0xbd, 0xd3, 0x19, 0x0d, + 0xf4, 0xe4, 0x8a, 0x18, 0xd5, 0xd9, 0xe7, 0xe8, 0x28, 0xb7, 0xf1, 0x09, 0xf2, 0x7f, 0x80, 0xcc, + 0xd6, 0xa1, 0xff, 0xe2, 0x53, 0x54, 0xbb, 0xa2, 0x51, 0x5a, 0xe4, 0x9d, 0x1b, 0xc1, 0x6f, 0x1e, + 0x3a, 0xfb, 0xef, 0xce, 0xe9, 0xd9, 0x1b, 0xd3, 0xb0, 0xb7, 0x58, 0x48, 0x48, 0x12, 0x7b, 0x9a, + 0x83, 0xe8, 0xb6, 0xbd, 0x16, 0x89, 0x1a, 0xc2, 0xc6, 0x69, 0x89, 0x0b, 0xe1, 0xe7, 0xa8, 0x3e, + 0x9a, 0xda, 0xab, 0xca, 0x47, 0xe3, 0xa4, 0x5b, 0x00, 0xc5, 0xfd, 0x94, 0x8a, 0x60, 0x8b, 0x1e, + 0x57, 0x48, 0x1d, 0x62, 0x2a, 0x59, 0x4c, 0x65, 0xa6, 0x83, 0x16, 0x37, 0xe3, 0x40, 0x5a, 0xf1, + 0x1d, 0x55, 0xb0, 0xa5, 0xb9, 0xc2, 0xcf, 0x15, 0x0e, 0x64, 0x6e, 0x97, 0xc6, 0x90, 0x80, 0xdc, + 0x80, 0x4c, 0x5a, 0x87, 0xe6, 0x66, 0x5c, 0x28, 0xf8, 0xdb, 0x43, 0x1f, 0x3b, 0x13, 0x3b, 0xa6, + 0xe1, 0x0d, 0xe3, 0xf0, 0x4e, 0x26, 0x83, 0xe9, 0x4f, 0x73, 0x88, 0xd7, 0x11, 0x55, 0xe5, 0x8c, + 0x38, 0x90, 0x7e, 0x6a, 0xaf, 0xd5, 0x4b, 0x4e, 0xaf, 0x23, 0x58, 0x98, 0x66, 0xd4, 0xc9, 0x0e, + 0x30, 0xcd, 0x84, 0x78, 0xc6, 0xde, 0xc2, 0x98, 0x5d, 0xdb, 0x3d, 0xe0, 0x20, 0xda, 0xfb, 0x2a, + 0x5c, 0xa7, 0x03, 0x91, 0xf2, 0x62, 0x0f, 0xec, 0x00, 0xdc, 0x41, 0x8f, 0xe7, 0x3a, 0xb9, 0x21, + 0x93, 0x2a, 0x9b, 0xd2, 0x15, 0x24, 0x66, 0x58, 0xea, 0xa4, 0x0a, 0x07, 0x7f, 0x78, 0xe8, 0xd4, + 0x7d, 0x7d, 0x42, 0xa8, 0xa1, 0x64, 0x1b, 0xd0, 0x83, 0xa6, 0xaf, 0xc6, 0x4c, 0x67, 0x9e, 0x7d, + 0x69, 0x6b, 0x6e, 0x4a, 0xa5, 0x4a, 0x53, 0xb6, 0xb0, 0xd7, 0x58, 0xda, 0x3a, 0xf1, 0x51, 0xf2, + 0xb3, 0x64, 0x4a, 0xd7, 0x61, 0x12, 0xaf, 0x13, 0x07, 0xc1, 0xdf, 0xa0, 0xa6, 0xbb, 0x01, 0x0e, + 0xef, 0xdf, 0x00, 0xae, 0x36, 0xf8, 0xc7, 0x43, 0x4f, 0x1c, 0x9d, 0xc9, 0x73, 0x6c, 0xea, 0xbd, + 0x2f, 0xd9, 0xa7, 0xe8, 0xe8, 0x6a, 0x6c, 0x98, 0x3c, 0x55, 0x6b, 0xe1, 0x4f, 0xd1, 0xa3, 0x57, + 0x2c, 0x82, 0x24, 0x4b, 0x14, 0xc4, 0xf3, 0x6c, 0x0d, 0x76, 0x18, 0x2a, 0xa8, 0x7e, 0x8b, 0xc5, + 0x12, 0xcf, 0x67, 0xa1, 0x30, 0xab, 0xa5, 0xd4, 0xfe, 0x7f, 0x29, 0x95, 0x2e, 0x1d, 0x55, 0xbb, + 0x14, 0xbc, 0x45, 0x4f, 0xef, 0x3e, 0x06, 0x7f, 0x85, 0x1a, 0x7d, 0xca, 0x17, 0x5b, 0xb6, 0xb0, + 0xb5, 0x56, 0x42, 0xce, 0xc5, 0x2d, 0xf0, 0x7e, 0x1a, 0xde, 0x82, 0x22, 0x3b, 0x25, 0xfe, 0x0c, + 0xf9, 0x93, 0x75, 0x72, 0xd7, 0xc2, 0x76, 0x1d, 0xb4, 0x26, 0x78, 0xb3, 0x17, 0xdb, 0xa1, 0x71, + 0x80, 0x8e, 0x27, 0x1c, 0xe6, 0x2c, 0x86, 0x7e, 0x2a, 0x13, 0x65, 0xc2, 0xfb, 0x64, 0x0f, 0xd3, + 0x95, 0x11, 0x58, 0xb2, 0x28, 0xd2, 0x90, 0x89, 0xe7, 0x13, 0x07, 0xc9, 0x17, 0xd8, 0x9a, 0x86, + 0x4c, 0x65, 0xa6, 0xe1, 0x3e, 0x29, 0xed, 0xe0, 0x77, 0x0f, 0xb5, 0x9c, 0xd0, 0x7d, 0x1a, 0x45, + 0x42, 0xf0, 0x21, 0x6c, 0x98, 0xfd, 0x34, 0xc5, 0xfa, 0xb6, 0xf5, 0x83, 0xc8, 0x23, 0xef, 0x00, + 0x9d, 0xda, 0x10, 0x96, 0xfa, 0x61, 0x4d, 0xf8, 0x44, 0xc4, 0xf6, 0x41, 0xed, 0x61, 0xf8, 0x4b, + 0xf4, 0x44, 0xaf, 0xaf, 0x64, 0x2a, 0xa2, 0x88, 0xf1, 0x95, 0x59, 0xc6, 0x1b, 0x1a, 0x25, 0x36, + 0x8f, 0xbb, 0xc9, 0xfe, 0x83, 0x5f, 0x6a, 0xf9, 0xd7, 0xfa, 0xc8, 0xfc, 0x7c, 0xf1, 0x6f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xe1, 0x74, 0x7a, 0x84, 0x2c, 0x08, 0x00, 0x00, } diff --git a/proto/types.proto b/proto/types.proto index e0dada46e..21697bc88 100644 --- a/proto/types.proto +++ b/proto/types.proto @@ -98,12 +98,13 @@ message IPConfiguration { message FirecrackerMachineConfiguration { string CPUTemplate = 1; // Specifies the cpu template. Example: "T2" or "C3" bool HtEnabled = 2; // Specifies if hyper-threading should be enabled - bool TrackDirtyPages = 3; // Specified if dirty-page-tracking should be enabled. // Specifies the memory size of VM // This lets us create a Firecracker VM of up to 4096 TiB, which // for a microVM should be large enough - uint32 MemSizeMib = 4; - uint32 VcpuCount = 5; // Specifies the number of vCPUs for the VM + uint32 MemSizeMib = 3; + uint32 VcpuCount = 4; // Specifies the number of vCPUs for the VM + bool TrackDirtyPages = 5; // Specified if dirty-page-tracking should be enabled. + } // Message to specify the block device config for a Firecracker VM diff --git a/runtime/service.go b/runtime/service.go index 27ba86491..98791d517 100644 --- a/runtime/service.go +++ b/runtime/service.go @@ -274,22 +274,24 @@ func (s *service) startEventForwarders(remotePublisher shim.Publisher) { go func() { <-s.vmReady - if ! s.snapLoaded { - // Once the VM is ready, also start forwarding events from it to our exchange - attachCh := eventbridge.Attach(ctx, s.eventBridgeClient, s.eventExchange) + if s.snapLoaded { + return + } - err := <-attachCh - if err != nil && err != context.Canceled && !strings.Contains(err.Error(), "context canceled") { - s.logger.WithError(err).Error("error while forwarding events from VM agent") - } + // Once the VM is ready, also start forwarding events from it to our exchange + attachCh := eventbridge.Attach(ctx, s.eventBridgeClient, s.eventExchange) - err = <-republishCh - if err != nil && err != context.Canceled { - s.logger.WithError(err).Error("error while republishing events") - } + err := <-attachCh + if err != nil && err != context.Canceled && !strings.Contains(err.Error(), "context canceled") { + s.logger.WithError(err).Error("error while forwarding events from VM agent") + } - remotePublisher.Close() + err = <-republishCh + if err != nil && err != context.Canceled { + s.logger.WithError(err).Error("error while republishing events") } + + remotePublisher.Close() }() } @@ -736,7 +738,7 @@ func (s *service) StopVM(requestCtx context.Context, request *proto.StopVMReques // shutdownSnapLoadedVm shuts down a vm that has been loaded from a snapshot func (s *service) shutdownSnapLoadedVm() error { - // Kill firecracker process and its shild processes + // Kill firecracker process and its child processes if err := syscall.Kill(-s.firecrackerPid, 9); err != nil { s.logger.WithError(err).Error("Failed to kill firecracker process") return err @@ -1799,9 +1801,9 @@ func (s *service) monitorVMExit() { func (s *service) createHTTPControlClient() { u := &httpunix.Transport{ - DialTimeout: 1000 * time.Millisecond, - RequestTimeout: 60 * time.Second, - ResponseHeaderTimeout: 60 * time.Second, + DialTimeout: 500 * time.Millisecond, + RequestTimeout: 15 * time.Second, + ResponseHeaderTimeout: 15 * time.Second, } u.RegisterLocation("firecracker", s.shimDir.FirecrackerSockPath()) @@ -2178,7 +2180,7 @@ func (s *service) SendCreateSnapRequest(createSnapReq *http.Request) error { } // Offload Shuts down a VM and deletes the corresponding firecracker socket -// and vsock. All of the other resources will persist. Depracated! +// and vsock. All of the other resources will persist. DEPRECATED! func (s *service) Offload(ctx context.Context, req *proto.OffloadRequest) (*empty.Empty, error) { if !s.snapLoaded {