github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 20:54:26 +00:00
Code Issues Projects Releases Wiki Activity

s390x: dimm not supported

Browse Source 
Dimm is not supported on s390x

Fixes: #106
Signed-off-by: Alice Frosi <afrosi@de.ibm.com>
This commit is contained in:
Alice Frosi 2019-08-26 16:05:17 +02:00
parent e6644f4a25
commit 9463486d58
4 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qemu/qemu.go
View File

@ -1761,7 +1761,9 @@ func (config *Config) appendMemoryKnobs() {
if config.Memory.Size == "" { if config.Memory.Size == "" {
return return
} }
if !isDimmSupported() {
return
}
var objMemParam, numaMemParam string var objMemParam, numaMemParam string
dimmName := "dimm1" dimmName := "dimm1"
if config.Knobs.HugePages { if config.Knobs.HugePages {

4
qemu/qemu_arch_base.go
View File

@ -105,3 +105,7 @@ func (n NetDeviceType) QemuDeviceParam() DeviceDriver {
} }
} }
func isDimmSupported() bool {
return true
}

20
qemu/qemu_test.go
View File

@ -521,6 +521,10 @@ func TestAppendKnobsAllFalse(t *testing.T) {
} }
func TestAppendMemoryHugePages(t *testing.T) { func TestAppendMemoryHugePages(t *testing.T) {
if !isDimmSupported() {
t.Skip("Dimm not supported")
}
conf := &Config{ conf := &Config{
Memory: Memory{ Memory: Memory{
Size: "1G", Size: "1G",
@ -545,6 +549,10 @@ func TestAppendMemoryHugePages(t *testing.T) {
} }
func TestAppendMemoryMemPrealloc(t *testing.T) { func TestAppendMemoryMemPrealloc(t *testing.T) {
if !isDimmSupported() {
t.Skip("Dimm not supported")
}
conf := &Config{ conf := &Config{
Memory: Memory{ Memory: Memory{
Size: "1G", Size: "1G",
@ -567,6 +575,10 @@ func TestAppendMemoryMemPrealloc(t *testing.T) {
} }
func TestAppendMemoryMemShared(t *testing.T) { func TestAppendMemoryMemShared(t *testing.T) {
if !isDimmSupported() {
t.Skip("Dimm not supported")
}
conf := &Config{ conf := &Config{
Memory: Memory{ Memory: Memory{
Size: "1G", Size: "1G",
@ -589,6 +601,10 @@ func TestAppendMemoryMemShared(t *testing.T) {
} }
func TestAppendMemoryFileBackedMem(t *testing.T) { func TestAppendMemoryFileBackedMem(t *testing.T) {
if !isDimmSupported() {
t.Skip("Dimm not supported")
}
conf := &Config{ conf := &Config{
Memory: Memory{ Memory: Memory{
Size: "1G", Size: "1G",
@ -611,6 +627,10 @@ func TestAppendMemoryFileBackedMem(t *testing.T) {
} }
func TestAppendMemoryFileBackedMemPrealloc(t *testing.T) { func TestAppendMemoryFileBackedMemPrealloc(t *testing.T) {
if !isDimmSupported() {
t.Skip("Dimm not supported")
}
conf := &Config{ conf := &Config{
Memory: Memory{ Memory: Memory{
Size: "1G", Size: "1G",

4
qemu/qemus390x.go
View File

@ -134,3 +134,7 @@ func (n NetDeviceType) QemuNetdevParam() string {
} }
} }
func isDimmSupported() bool {
return false
}