[botanist] Don't rely on host memory detection
Detecting the amount of available memory using sysinfo is unreliable,
especially inside the container and it seems like there's no reliable
way to do so, see for more context:
https://fabiokung.com/2014/03/13/memory-inside-linux-containers/
So instead simply rely on a value provided on the command line.
Change-Id: Ib8d13c98635dcf9fbc3eca4c79aedb4e55945c7c
diff --git a/cmd/botanist/qemu.go b/cmd/botanist/qemu.go
index 3208168..4dfd444 100644
--- a/cmd/botanist/qemu.go
+++ b/cmd/botanist/qemu.go
@@ -8,12 +8,10 @@
"context"
"flag"
"fmt"
- "runtime"
"fuchsia.googlesource.com/tools/botanist/target"
"fuchsia.googlesource.com/tools/build"
"fuchsia.googlesource.com/tools/logger"
- "fuchsia.googlesource.com/tools/memory"
"fuchsia.googlesource.com/tools/secrets"
"github.com/google/subcommands"
)
@@ -65,15 +63,14 @@
}
func (cmd *QEMUCommand) SetFlags(f *flag.FlagSet) {
- totalMB := int(memory.Total()) / (1024 * 1024)
f.StringVar(&cmd.imageManifest, "images", "", "path to an image manifest")
f.StringVar(&cmd.qemuBinDir, "qemu-dir", "", "")
f.StringVar(&cmd.minFSImage, "minfs", "", "path to minFS image")
f.StringVar(&cmd.minFSBlkDevPCIAddr, "pci-addr", "06.0", "minFS block device PCI address")
f.StringVar(&cmd.targetArch, "arch", "", "target architecture (x64 or arm64)")
f.BoolVar(&cmd.enableKVM, "use-kvm", false, "whether to enable KVM")
- f.IntVar(&cmd.cpu, "cpu", runtime.NumCPU(), "number of processors to emulate")
- f.IntVar(&cmd.memory, "memory", totalMB, "amount of memory (in MB) to provide")
+ f.IntVar(&cmd.cpu, "cpu", 4, "number of processors to emulate")
+ f.IntVar(&cmd.memory, "memory", 4096, "amount of memory (in MB) to provide")
}
func (cmd *QEMUCommand) execute(ctx context.Context, cmdlineArgs []string) error {
