mirror of
				https://github.com/containers/podman.git
				synced 2025-10-31 10:00:01 +08:00 
			
		
		
		
	Bump github.com/containers/storage from 1.24.3 to 1.24.4
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.24.3 to 1.24.4. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.24.3...v1.24.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
		![27856297+dependabot-preview[bot]@users.noreply.github.com](/assets/img/avatar_default.png) dependabot-preview[bot]
					dependabot-preview[bot]
				
			
				
					committed by
					
						 Daniel J Walsh
						Daniel J Walsh
					
				
			
			
				
	
			
			
			 Daniel J Walsh
						Daniel J Walsh
					
				
			
						parent
						
							07663f74c4
						
					
				
				
					commit
					057faea5c1
				
			
							
								
								
									
										49
									
								
								vendor/github.com/Microsoft/hcsshim/internal/hcs/service.go
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								vendor/github.com/Microsoft/hcsshim/internal/hcs/service.go
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							| @ -0,0 +1,49 @@ | ||||
| package hcs | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"encoding/json" | ||||
|  | ||||
| 	hcsschema "github.com/Microsoft/hcsshim/internal/schema2" | ||||
| 	"github.com/Microsoft/hcsshim/internal/vmcompute" | ||||
| ) | ||||
|  | ||||
| // GetServiceProperties returns properties of the host compute service. | ||||
| func GetServiceProperties(ctx context.Context, q hcsschema.PropertyQuery) (*hcsschema.ServiceProperties, error) { | ||||
| 	operation := "hcsshim::GetServiceProperties" | ||||
|  | ||||
| 	queryb, err := json.Marshal(q) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	propertiesJSON, resultJSON, err := vmcompute.HcsGetServiceProperties(ctx, string(queryb)) | ||||
| 	events := processHcsResult(ctx, resultJSON) | ||||
| 	if err != nil { | ||||
| 		return nil, &HcsError{Op: operation, Err: err, Events: events} | ||||
| 	} | ||||
|  | ||||
| 	if propertiesJSON == "" { | ||||
| 		return nil, ErrUnexpectedValue | ||||
| 	} | ||||
| 	properties := &hcsschema.ServiceProperties{} | ||||
| 	if err := json.Unmarshal([]byte(propertiesJSON), properties); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	return properties, nil | ||||
| } | ||||
|  | ||||
| // ModifyServiceSettings modifies settings of the host compute service. | ||||
| func ModifyServiceSettings(ctx context.Context, settings hcsschema.ModificationRequest) error { | ||||
| 	operation := "hcsshim::ModifyServiceSettings" | ||||
|  | ||||
| 	settingsJSON, err := json.Marshal(settings) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	resultJSON, err := vmcompute.HcsModifyServiceSettings(ctx, string(settingsJSON)) | ||||
| 	events := processHcsResult(ctx, resultJSON) | ||||
| 	if err != nil { | ||||
| 		return &HcsError{Op: operation, Err: err, Events: events} | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
							
								
								
									
										5
									
								
								vendor/github.com/Microsoft/hcsshim/internal/hcs/syscall.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								vendor/github.com/Microsoft/hcsshim/internal/hcs/syscall.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -1,5 +0,0 @@ | ||||
| package hcs | ||||
|  | ||||
| //go:generate go run ../../mksyscall_windows.go -output zsyscall_windows.go syscall.go | ||||
|  | ||||
| //sys hcsFormatWritableLayerVhd(handle uintptr) (hr error) = computestorage.HcsFormatWritableLayerVhd | ||||
							
								
								
									
										3
									
								
								vendor/github.com/Microsoft/hcsshim/internal/hcs/system.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								vendor/github.com/Microsoft/hcsshim/internal/hcs/system.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -28,8 +28,7 @@ type System struct { | ||||
| 	waitBlock      chan struct{} | ||||
| 	waitError      error | ||||
| 	exitError      error | ||||
|  | ||||
| 	os, typ string | ||||
| 	os, typ        string | ||||
| } | ||||
|  | ||||
| func newSystem(id string) *System { | ||||
|  | ||||
							
								
								
									
										5
									
								
								vendor/github.com/Microsoft/hcsshim/internal/hcs/utils.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								vendor/github.com/Microsoft/hcsshim/internal/hcs/utils.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -7,6 +7,7 @@ import ( | ||||
|  | ||||
| 	"github.com/Microsoft/go-winio" | ||||
| 	diskutil "github.com/Microsoft/go-winio/vhd" | ||||
| 	"github.com/Microsoft/hcsshim/computestorage" | ||||
| 	"github.com/pkg/errors" | ||||
| 	"golang.org/x/sys/windows" | ||||
| ) | ||||
| @ -36,7 +37,7 @@ func makeOpenFiles(hs []syscall.Handle) (_ []io.ReadWriteCloser, err error) { | ||||
| 	return fs, nil | ||||
| } | ||||
|  | ||||
| // creates a VHD formatted with NTFS of size `sizeGB` at the given `vhdPath`. | ||||
| // CreateNTFSVHD creates a VHD formatted with NTFS of size `sizeGB` at the given `vhdPath`. | ||||
| func CreateNTFSVHD(ctx context.Context, vhdPath string, sizeGB uint32) (err error) { | ||||
| 	if err := diskutil.CreateVhdx(vhdPath, sizeGB, 1); err != nil { | ||||
| 		return errors.Wrap(err, "failed to create VHD") | ||||
| @ -53,7 +54,7 @@ func CreateNTFSVHD(ctx context.Context, vhdPath string, sizeGB uint32) (err erro | ||||
| 		} | ||||
| 	}() | ||||
|  | ||||
| 	if err := hcsFormatWritableLayerVhd(uintptr(vhd)); err != nil { | ||||
| 	if err := computestorage.FormatWritableLayerVhd(ctx, windows.Handle(vhd)); err != nil { | ||||
| 		return errors.Wrap(err, "failed to format VHD") | ||||
| 	} | ||||
|  | ||||
|  | ||||
							
								
								
									
										54
									
								
								vendor/github.com/Microsoft/hcsshim/internal/hcs/zsyscall_windows.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										54
									
								
								vendor/github.com/Microsoft/hcsshim/internal/hcs/zsyscall_windows.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -1,54 +0,0 @@ | ||||
| // Code generated mksyscall_windows.exe DO NOT EDIT | ||||
|  | ||||
| package hcs | ||||
|  | ||||
| import ( | ||||
| 	"syscall" | ||||
| 	"unsafe" | ||||
|  | ||||
| 	"golang.org/x/sys/windows" | ||||
| ) | ||||
|  | ||||
| var _ unsafe.Pointer | ||||
|  | ||||
| // Do the interface allocations only once for common | ||||
| // Errno values. | ||||
| const ( | ||||
| 	errnoERROR_IO_PENDING = 997 | ||||
| ) | ||||
|  | ||||
| var ( | ||||
| 	errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING) | ||||
| ) | ||||
|  | ||||
| // errnoErr returns common boxed Errno values, to prevent | ||||
| // allocations at runtime. | ||||
| func errnoErr(e syscall.Errno) error { | ||||
| 	switch e { | ||||
| 	case 0: | ||||
| 		return nil | ||||
| 	case errnoERROR_IO_PENDING: | ||||
| 		return errERROR_IO_PENDING | ||||
| 	} | ||||
| 	// TODO: add more here, after collecting data on the common | ||||
| 	// error values see on Windows. (perhaps when running | ||||
| 	// all.bat?) | ||||
| 	return e | ||||
| } | ||||
|  | ||||
| var ( | ||||
| 	modcomputestorage = windows.NewLazySystemDLL("computestorage.dll") | ||||
|  | ||||
| 	procHcsFormatWritableLayerVhd = modcomputestorage.NewProc("HcsFormatWritableLayerVhd") | ||||
| ) | ||||
|  | ||||
| func hcsFormatWritableLayerVhd(handle uintptr) (hr error) { | ||||
| 	r0, _, _ := syscall.Syscall(procHcsFormatWritableLayerVhd.Addr(), 1, uintptr(handle), 0, 0) | ||||
| 	if int32(r0) < 0 { | ||||
| 		if r0&0x1fff0000 == 0x00070000 { | ||||
| 			r0 &= 0xffff | ||||
| 		} | ||||
| 		hr = syscall.Errno(r0) | ||||
| 	} | ||||
| 	return | ||||
| } | ||||
		Reference in New Issue
	
	Block a user