Skip to content

This turns off default interactive mode of qemu in macos #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qbit- wants to merge 1 commit into
base: master
Choose a base branch
from
Open

This turns off default interactive mode of qemu in macos #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions qemucli/args.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,20 @@ const (
)

var safeArgs = map[string]ArgAcceptedValue{
"accel": ArgAcceptedValueKeyValue,
"boot": ArgAcceptedValueString,
"m": ArgAcceptedValueUint,
"smp": ArgAcceptedValueUint,
"device": ArgAcceptedValueKeyValue,
"netdev": ArgAcceptedValueKeyValue,
"serial": ArgAcceptedValueString,
"cdrom": ArgAcceptedValueString,
"machine": ArgAcceptedValueKeyValue,
"cpu": ArgAcceptedValueString,
"display": ArgAcceptedValueString,
"drive": ArgAcceptedValueKeyValue,
"bios": ArgAcceptedValueString,
"accel": ArgAcceptedValueKeyValue,
"boot": ArgAcceptedValueString,
"m": ArgAcceptedValueUint,
"smp": ArgAcceptedValueUint,
"device": ArgAcceptedValueKeyValue,
"netdev": ArgAcceptedValueKeyValue,
"serial": ArgAcceptedValueString,
"cdrom": ArgAcceptedValueString,
"machine": ArgAcceptedValueKeyValue,
"cpu": ArgAcceptedValueString,
"display": ArgAcceptedValueString,
"drive": ArgAcceptedValueKeyValue,
"bios": ArgAcceptedValueString,
"nographic": ArgAcceptedValueNone,
}

type Arg interface {
Expand Down Expand Up @@ -89,7 +90,7 @@ func EncodeArg(a Arg) (string, *string, error) {
return "", nil, fmt.Errorf("arg returned a value while declaring no value (type %v)", reflect.TypeOf(a))
}

return argKey, nil, nil
return "-" + argKey, nil, nil
}

argValueStr := a.StringValue()
Expand Down
3 changes: 2 additions & 1 deletion vm/cfg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ func configureBaseVMCmd(logger *slog.Logger, cfg Config) (string, []qemucli.Arg,
baseCmd := "qemu-system"

args := []qemucli.Arg{
qemucli.MustNewStringArg("serial", "stdio"),
qemucli.MustNewFlagArg("nographic"),
qemucli.MustNewStringArg("serial", "mon:stdio"),
qemucli.MustNewUintArg("m", cfg.MemoryAlloc),
qemucli.MustNewUintArg("smp", runtime.NumCPU()),
}
Expand Down