A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
feat: advanced QEMU args + extra kernel cmdline editor in Settings (#21)
ExTv1d26fed4ebaf
diff --git a/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt b/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.ktindex 3d1ec17..1dcd58a 100644--- a/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt+++ b/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt@@ -39,6 +39,19 @@ class SettingsRepository @Inject constructor(val KEY_SSH_ENABLED = booleanPreferencesKey("ssh_enabled")val KEY_TERMINAL_COLOR_THEME = stringPreferencesKey("terminal_color_theme")val KEY_TERMINAL_FONT = stringPreferencesKey("terminal_font")+ val KEY_QEMU_EXTRA_ARGS = stringPreferencesKey("qemu_extra_args")+ val KEY_KERNEL_EXTRA_CMDLINE = stringPreferencesKey("kernel_extra_cmdline")++ /** Default tunable QEMU args — CPU model, accel tuning, RNG source, overcommit. */+ const val DEFAULT_QEMU_EXTRA_ARGS =+ "-cpu max " ++ "-accel tcg,thread=multi,tb-size=256 " ++ "-object rng-random,id=rng0,filename=/dev/urandom " ++ "-device virtio-rng-pci,rng=rng0 " ++ "-overcommit mem-lock=off"++ /** Default extra kernel cmdline — log level, TCG-safe mitigations, I/O scheduler. */+ const val DEFAULT_KERNEL_EXTRA_CMDLINE = "loglevel=1 quiet mitigations=off elevator=mq-deadline"}val darkTheme: Flow<Boolean> = context.dataStore.data@@ -72,6 +85,12 @@ class SettingsRepository @Inject constructor(val terminalFont: Flow<String> = context.dataStore.data.map { it[KEY_TERMINAL_FONT] ?: "default" }+ val qemuExtraArgs: Flow<String> = context.dataStore.data+ .map { it[KEY_QEMU_EXTRA_ARGS] ?: DEFAULT_QEMU_EXTRA_ARGS }++ val kernelExtraCmdline: Flow<String> = context.dataStore.data+ .map { it[KEY_KERNEL_EXTRA_CMDLINE] ?: DEFAULT_KERNEL_EXTRA_CMDLINE }+suspend fun setDarkTheme(value: Boolean) =context.dataStore.edit { it[KEY_DARK_THEME] = value }@@ -103,6 +122,12 @@ class SettingsRepository @Inject constructor(suspend fun setTerminalFont(value: String) =context.dataStore.edit { it[KEY_TERMINAL_FONT] = value }+ suspend fun setQemuExtraArgs(value: String) =+ context.dataStore.edit { it[KEY_QEMU_EXTRA_ARGS] = value }++ suspend fun setKernelExtraCmdline(value: String) =+ context.dataStore.edit { it[KEY_KERNEL_EXTRA_CMDLINE] = value }+suspend fun getSshEnabledSnapshot(): Boolean =context.dataStore.data.map { it[KEY_SSH_ENABLED] ?: false }.first()@@ -127,4 +152,10 @@ class SettingsRepository @Inject constructor(suspend fun getTerminalFontSnapshot(): String =context.dataStore.data.map { it[KEY_TERMINAL_FONT] ?: "default" }.first()++ suspend fun getQemuExtraArgsSnapshot(): String =+ context.dataStore.data.map { it[KEY_QEMU_EXTRA_ARGS] ?: DEFAULT_QEMU_EXTRA_ARGS }.first()++ suspend fun getKernelExtraCmdlineSnapshot(): String =+ context.dataStore.data.map { it[KEY_KERNEL_EXTRA_CMDLINE] ?: DEFAULT_KERNEL_EXTRA_CMDLINE }.first()}diff --git a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.ktindex fa1ae8a..2affb2d 100644--- a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt+++ b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt@@ -458,12 +458,18 @@ class PodroidQemu @Inject constructor(): List<String> {val args = mutableListOf<String>()+ // User-tunable extras (CPU model, accel tuning, RNG, overcommit, kernel cmdline extras).+ // Pulled from SettingsRepository; falls back to the documented defaults.+ val userQemuExtras = kotlinx.coroutines.runBlocking {+ settingsRepository.getQemuExtraArgsSnapshot()+ }.trim()+ val userKernelExtras = kotlinx.coroutines.runBlocking {+ settingsRepository.getKernelExtraCmdlineSnapshot()+ }.trim()+args += "-M"; args += "virt,gic-version=3"- args += "-cpu"; args += "max"args += "-smp"; args += "$cpus"args += "-m"; args += "$ramMb"- val tbSize = if (ramMb >= 2048) 512 else 256- args += "-accel"; args += "tcg,thread=multi,tb-size=$tbSize"val kernelPath = File(context.filesDir, "vmlinuz-virt")val initrdPath = File(context.filesDir, "initrd.img")@@ -471,7 +477,8 @@ class PodroidQemu @Inject constructor(if (kernelPath.exists()) {args += "-kernel"; args += kernelPath.absolutePathval cmdline = buildString {- append("console=ttyAMA0 loglevel=1 quiet mitigations=off elevator=mq-deadline")+ append("console=ttyAMA0")+ if (userKernelExtras.isNotEmpty()) append(" ").append(userKernelExtras)append(" androidip=$androidIp")if (sshEnabled) append(" ssh=1")}@@ -493,9 +500,6 @@ class PodroidQemu @Inject constructor(args += "-drive"; args += "file=${storagePath.absolutePath},if=none,id=drive1,format=raw,cache=writeback,aio=threads"}- args += "-object"; args += "rng-random,id=rng0,filename=/dev/urandom"- args += "-device"; args += "virtio-rng-pci,rng=rng0"-// Downloads folder sharing via virtio-9pval downloadsDir = android.os.Environment.getExternalStoragePublicDirectory(android.os.Environment.DIRECTORY_DOWNLOADS@@ -536,7 +540,12 @@ class PodroidQemu @Inject constructor(args += "-display"; args += "none"args += "-qmp"; args += "unix:$qmpSocketPath,server,nowait"- args += "-overcommit"; args += "mem-lock=off"++ // User extras appended last so they can override earlier args where+ // QEMU allows it (later -cpu / -accel overrides earlier ones).+ if (userQemuExtras.isNotEmpty()) {+ args += userQemuExtras.split(Regex("\\s+"))+ }return listOf(qemuExe.absolutePath) + args}diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.ktindex b0e8ebc..50bba64 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt@@ -19,8 +19,11 @@ import androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.automirrored.filled.ArrowBackimport androidx.compose.material.icons.filled.Addimport androidx.compose.material.icons.filled.Delete+import androidx.compose.material.icons.filled.ExpandLess+import androidx.compose.material.icons.filled.ExpandMoreimport androidx.compose.material.icons.filled.RestartAltimport androidx.compose.material.icons.filled.Share+import androidx.compose.material.icons.filled.Warningimport androidx.compose.material3.AlertDialogimport androidx.compose.material3.ButtonDefaultsimport androidx.compose.material3.Card@@ -75,6 +78,9 @@ fun SettingsScreen(val vmCpus by viewModel.vmCpus.collectAsStateWithLifecycle()val storageSizeGb by viewModel.storageSizeGb.collectAsStateWithLifecycle()val sshEnabled by viewModel.sshEnabled.collectAsStateWithLifecycle(false)+ val qemuExtraArgs by viewModel.qemuExtraArgs.collectAsStateWithLifecycle()+ val kernelExtraCmdline by viewModel.kernelExtraCmdline.collectAsStateWithLifecycle()+ var advancedExpanded by remember { mutableStateOf(false) }var showAddDialog by remember { mutableStateOf(false) }var showResetDialog by remember { mutableStateOf(false) }val context = LocalContext.current@@ -319,6 +325,90 @@ fun SettingsScreen(Spacer(Modifier.height(16.dp))+ // ── Advanced QEMU ─────────────────────────────────────────+ Row(+ modifier = Modifier+ .fillMaxWidth()+ .clickable { advancedExpanded = !advancedExpanded }+ .padding(vertical = 8.dp),+ verticalAlignment = Alignment.CenterVertically,+ ) {+ Text(+ text = "Advanced QEMU",+ style = MaterialTheme.typography.titleMedium,+ fontWeight = FontWeight.Bold,+ modifier = Modifier.weight(1f),+ )+ Icon(+ imageVector = if (advancedExpanded) Icons.Default.ExpandLess else Icons.Default.ExpandMore,+ contentDescription = if (advancedExpanded) "Collapse" else "Expand",+ )+ }++ if (advancedExpanded) {+ Card(+ modifier = Modifier+ .fillMaxWidth()+ .padding(bottom = 8.dp),+ colors = CardDefaults.cardColors(+ containerColor = MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.4f),+ ),+ ) {+ Row(+ modifier = Modifier.padding(12.dp),+ verticalAlignment = Alignment.Top,+ ) {+ Icon(+ Icons.Default.Warning,+ contentDescription = null,+ tint = MaterialTheme.colorScheme.error,+ modifier = Modifier.padding(end = 8.dp, top = 2.dp),+ )+ Text(+ text = "Editing these may prevent the VM from booting. " ++ "RAM, CPU count, sockets, storage, and networking are " ++ "managed by the app and not exposed here. Use Reset if " ++ "the VM stops booting.",+ style = MaterialTheme.typography.bodySmall,+ color = MaterialTheme.colorScheme.onErrorContainer,+ )+ }+ }++ if (!vmNotRunning) {+ Text(+ text = "Stop the VM before editing — changes apply on next boot.",+ style = MaterialTheme.typography.labelSmall,+ color = MaterialTheme.colorScheme.error,+ modifier = Modifier.padding(bottom = 8.dp),+ )+ }++ AdvancedTextSetting(+ label = "Extra QEMU args",+ helper = "-cpu, -accel, -object, -device, -overcommit, etc. Whitespace-separated.",+ value = qemuExtraArgs,+ enabled = vmNotRunning,+ onValueChange = viewModel::setQemuExtraArgs,+ onReset = viewModel::resetQemuExtraArgs,+ minLines = 4,+ )++ Spacer(Modifier.height(12.dp))++ AdvancedTextSetting(+ label = "Extra kernel cmdline",+ helper = "Appended after console=ttyAMA0 — controls scheduler, mitigations, log level, etc.",+ value = kernelExtraCmdline,+ enabled = vmNotRunning,+ onValueChange = viewModel::setKernelExtraCmdline,+ onReset = viewModel::resetKernelExtraCmdline,+ minLines = 2,+ )++ Spacer(Modifier.height(16.dp))+ }+// ── About ─────────────────────────────────────────────────SettingsSectionHeader("About")@@ -540,3 +630,51 @@ private fun SettingsInfoRow(label: String, value: String) {)}}++@Composable+private fun AdvancedTextSetting(+ label: String,+ helper: String,+ value: String,+ enabled: Boolean,+ onValueChange: (String) -> Unit,+ onReset: () -> Unit,+ minLines: Int,+) {+ var localValue by remember(value) { mutableStateOf(value) }++ Column(modifier = Modifier.fillMaxWidth()) {+ OutlinedTextField(+ value = localValue,+ onValueChange = {+ localValue = it+ onValueChange(it)+ },+ label = { Text(label) },+ enabled = enabled,+ singleLine = false,+ minLines = minLines,+ textStyle = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace),+ modifier = Modifier.fillMaxWidth(),+ )+ Row(+ modifier = Modifier+ .fillMaxWidth()+ .padding(top = 4.dp),+ verticalAlignment = Alignment.CenterVertically,+ ) {+ Text(+ text = helper,+ style = MaterialTheme.typography.bodySmall,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ modifier = Modifier.weight(1f),+ )+ TextButton(+ onClick = onReset,+ enabled = enabled,+ ) {+ Text("Reset")+ }+ }+ }+}diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.ktindex ae85584..d42bdd0 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt@@ -58,6 +58,28 @@ class SettingsViewModel @Inject constructor(val terminalFont: StateFlow<String> = settingsRepository.terminalFont.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), "default")+ val qemuExtraArgs: StateFlow<String> = settingsRepository.qemuExtraArgs+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), SettingsRepository.DEFAULT_QEMU_EXTRA_ARGS)++ val kernelExtraCmdline: StateFlow<String> = settingsRepository.kernelExtraCmdline+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), SettingsRepository.DEFAULT_KERNEL_EXTRA_CMDLINE)++ fun setQemuExtraArgs(value: String) {+ viewModelScope.launch { settingsRepository.setQemuExtraArgs(value) }+ }++ fun setKernelExtraCmdline(value: String) {+ viewModelScope.launch { settingsRepository.setKernelExtraCmdline(value) }+ }++ fun resetQemuExtraArgs() {+ viewModelScope.launch { settingsRepository.setQemuExtraArgs(SettingsRepository.DEFAULT_QEMU_EXTRA_ARGS) }+ }++ fun resetKernelExtraCmdline() {+ viewModelScope.launch { settingsRepository.setKernelExtraCmdline(SettingsRepository.DEFAULT_KERNEL_EXTRA_CMDLINE) }+ }+val storageSizeGb: StateFlow<Int> = settingsRepository.storageSizeGb.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 2)@@ -188,6 +210,8 @@ class SettingsViewModel @Inject constructor(val storageAccess = runCatching { settingsRepository.getStorageAccessEnabledSnapshot() }.getOrDefault(false)val theme = runCatching { settingsRepository.getTerminalColorThemeSnapshot() }.getOrDefault("default")val font = runCatching { settingsRepository.getTerminalFontSnapshot() }.getOrDefault("default")+ val qemuExtras = runCatching { settingsRepository.getQemuExtraArgsSnapshot() }.getOrDefault("")+ val kernelExtras = runCatching { settingsRepository.getKernelExtraCmdlineSnapshot() }.getOrDefault("")val rules = runCatching { portForwardRepository.getRulesSnapshot() }.getOrDefault(emptyList())buildString {@@ -220,6 +244,8 @@ class SettingsViewModel @Inject constructor(appendLine("Downloads sharing: $storageAccess")appendLine("Terminal theme: $theme")appendLine("Terminal font: $font")+ appendLine("QEMU extra args: $qemuExtras")+ appendLine("Kernel extra cmd: $kernelExtras")appendLine()appendLine("=== VM State ===")