Skip to content

Commit 85fae32

Browse files
committed
remove duplicates resulting from rebase
Signed-off-by: Plamen Petrov <[email protected]>
1 parent 95e479a commit 85fae32

File tree

6 files changed

+330
-192
lines changed

6 files changed

+330
-192
lines changed

firecracker-control/local.go

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -248,42 +248,6 @@ func (s *local) StopVM(requestCtx context.Context, req *proto.StopVMRequest) (*e
248248
return resp, multierror.Append(shimErr, waitErr).ErrorOrNil()
249249
}
250250

251-
// PauseVM pauses a VM
252-
func (s *local) PauseVM(ctx context.Context, req *proto.PauseVMRequest) (*empty.Empty, error) {
253-
client, err := s.shimFirecrackerClient(ctx, req.VMID)
254-
if err != nil {
255-
return nil, err
256-
}
257-
258-
defer client.Close()
259-
260-
resp, err := client.PauseVM(ctx, req)
261-
if err != nil {
262-
s.logger.WithError(err).Error()
263-
return nil, err
264-
}
265-
266-
return resp, nil
267-
}
268-
269-
// ResumeVM resumes a VM
270-
func (s *local) ResumeVM(ctx context.Context, req *proto.ResumeVMRequest) (*empty.Empty, error) {
271-
client, err := s.shimFirecrackerClient(ctx, req.VMID)
272-
if err != nil {
273-
return nil, err
274-
}
275-
276-
defer client.Close()
277-
278-
resp, err := client.ResumeVM(ctx, req)
279-
if err != nil {
280-
s.logger.WithError(err).Error()
281-
return nil, err
282-
}
283-
284-
return resp, nil
285-
}
286-
287251
func (s *local) waitForShimToExit(ctx context.Context, vmID string) error {
288252
socketAddr, err := shim.SocketAddress(ctx, s.containerdAddress, vmID)
289253
if err != nil {

firecracker-control/service.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,6 @@ func (s *service) CreateVM(ctx context.Context, req *proto.CreateVMRequest) (*pr
7272
return s.local.CreateVM(ctx, req)
7373
}
7474

75-
func (s *service) PauseVM(ctx context.Context, req *proto.PauseVMRequest) (*empty.Empty, error) {
76-
log.G(ctx).Debugf("pause VM request: %+v", req)
77-
return s.local.PauseVM(ctx, req)
78-
}
79-
80-
func (s *service) ResumeVM(ctx context.Context, req *proto.ResumeVMRequest) (*empty.Empty, error) {
81-
log.G(ctx).Debugf("resume VM request: %+v", req)
82-
return s.local.ResumeVM(ctx, req)
83-
}
84-
8575
func (s *service) StopVM(ctx context.Context, req *proto.StopVMRequest) (*empty.Empty, error) {
8676
log.G(ctx).Debugf("stop VM: %+v", req)
8777
return s.local.StopVM(ctx, req)

0 commit comments

Comments
 (0)