* [PATCH bluez 0/3] tools/test-runner: Add arm64 host support
@ 2026-11-22 10:34 Zijun Hu
2026-11-22 10:34 ` [PATCH bluez 1/3] doc/test-runner: s/CONFIG_BT_HCIBTINTEL_PCIE/CONFIG_BT_INTEL_PCIE/ Zijun Hu
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Zijun Hu @ 2026-11-22 10:34 UTC (permalink / raw)
To: Linux Bluetooth; +Cc: Marcel Holtmann, Luiz Augusto von Dentz, Zijun Hu
This series mainly:
- Adds support for running test-runner on arm64 hosts
- Allows starting bluetoothd without debug output
---
Zijun Hu (3):
doc/test-runner: s/CONFIG_BT_HCIBTINTEL_PCIE/CONFIG_BT_INTEL_PCIE/
tools/test-runner: Support running on arm64 hosts
tools/test-runner: Allow suppressing noisy bluetoothd debug output
doc/test-runner.rst | 26 ++++++++++--
tools/test-runner.c | 114 +++++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 112 insertions(+), 28 deletions(-)
---
base-commit: 1adfe662efeff12997df9ddd0960dbd0de9c8ea7
change-id: 20261122-tr_arm64-c6751a5cf021
Best regards,
--
Zijun Hu <zijun.hu@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH bluez 1/3] doc/test-runner: s/CONFIG_BT_HCIBTINTEL_PCIE/CONFIG_BT_INTEL_PCIE/
2026-11-22 10:34 [PATCH bluez 0/3] tools/test-runner: Add arm64 host support Zijun Hu
@ 2026-11-22 10:34 ` Zijun Hu
2026-11-22 10:34 ` [PATCH bluez 2/3] tools/test-runner: Support running on arm64 hosts Zijun Hu
2026-11-22 10:34 ` [PATCH bluez 3/3] tools/test-runner: Allow suppressing noisy bluetoothd debug output Zijun Hu
2 siblings, 0 replies; 5+ messages in thread
From: Zijun Hu @ 2026-11-22 10:34 UTC (permalink / raw)
To: Linux Bluetooth; +Cc: Marcel Holtmann, Luiz Augusto von Dentz, Zijun Hu
The btintel_pcie driver is enabled by CONFIG_BT_INTEL_PCIE, not
CONFIG_BT_HCIBTINTEL_PCIE, which does not exist.
Also split CONFIG_SERIAL_8250_PCI=yCONFIG_DEBUG_KERNEL=y into two lines.
Assisted-by: Claude:claude-opus-5-5
---
doc/test-runner.rst | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/doc/test-runner.rst b/doc/test-runner.rst
index 220a2cec1c55..b5876e4f5108 100644
--- a/doc/test-runner.rst
+++ b/doc/test-runner.rst
@@ -190,17 +190,18 @@ option (like the Bluetooth subsystem) can be enabled on top of this.
CONFIG_NET_9P=y
CONFIG_NET_9P_VIRTIO=y
CONFIG_9P_FS=y
CONFIG_9P_FS_POSIX_ACL=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
- CONFIG_SERIAL_8250_PCI=yCONFIG_DEBUG_KERNEL=y
+ CONFIG_SERIAL_8250_PCI=y
+ CONFIG_DEBUG_KERNEL=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TMPFS_XATTR=y
CONFIG_DEVTMPFS=y
CONFIG_DEBUG_FS=y
@@ -381,17 +382,17 @@ Running shell with host controller PCIe-passthrough
In addition the above kernel config option the following is required:
.. code-block::
CONFIG_PCI=y
CONFIG_PCI_MSI=y
CONFIG_ACPI=y
- CONFIG_BT_HCIBTINTEL_PCIE=y
+ CONFIG_BT_INTEL_PCIE=y
IOMMU and interrupt remapping, without which vfio-pci fails to allocate
MSI-X vectors (-ENOSPC):
.. code-block::
CONFIG_INTEL_IOMMU=y
CONFIG_INTEL_IOMMU_DEFAULT_ON=y
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH bluez 2/3] tools/test-runner: Support running on arm64 hosts
2026-11-22 10:34 [PATCH bluez 0/3] tools/test-runner: Add arm64 host support Zijun Hu
2026-11-22 10:34 ` [PATCH bluez 1/3] doc/test-runner: s/CONFIG_BT_HCIBTINTEL_PCIE/CONFIG_BT_INTEL_PCIE/ Zijun Hu
@ 2026-11-22 10:34 ` Zijun Hu
2026-11-22 16:24 ` Pauli Virtanen
2026-11-22 10:34 ` [PATCH bluez 3/3] tools/test-runner: Allow suppressing noisy bluetoothd debug output Zijun Hu
2 siblings, 1 reply; 5+ messages in thread
From: Zijun Hu @ 2026-11-22 10:34 UTC (permalink / raw)
To: Linux Bluetooth; +Cc: Marcel Holtmann, Luiz Augusto von Dentz, Zijun Hu
Add arm64 support by:
- Using qemu-system-aarch64 with the virt machine and the arm64 Image
- Passing -cpu max or host, as the default virt CPU is 32-bit
- Using earlycon and leaving out the x86-only options
- Warning when /dev/kvm is not accessible, as QEMU then falls back
to TCG
Assisted-by: Claude:claude-opus-5-5
---
doc/test-runner.rst | 5 ++++-
tools/test-runner.c | 49 ++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/doc/test-runner.rst b/doc/test-runner.rst
index b5876e4f5108..4ff9d1b02c1b 100644
--- a/doc/test-runner.rst
+++ b/doc/test-runner.rst
@@ -21,17 +21,20 @@ OPTIONS
:-m/--monitor: Start btmon
:-l/--emulator[=num]: Start btvirt
:-A/-audio[=path]: Start audio server
:-u/--unix[=path]: Provide serial device
:-U/--usb=<qemu_args>: Provide USB device
:-P/--pcie=<qemu_args>: Provide PCIe device
:-q/--qemu=<path>: QEMU binary
:-H/--qemu-host-cpu: Use host CPU (requires KVM support)
-:-k/--kernel=<image>: Kernel image (bzImage) or User Mode Linux binary
+:-k/--kernel=<image>: Kernel image or source tree path:
+
+ | x86: bzImage or User Mode Linux binary
+ | arm64: Image
:-F/--virtiofs[=<path>]: Path to virtiofsd, or no to disable virtio-fs
:-T/--time-travel: Run a User Mode Linux kernel on simulated time, with
btvirt as time travel calendar (default if the kernel supports it)
:-R/--real-time: Run a User Mode Linux kernel on real time
:-o/--option=<opt>: Additional argument passed to QEMU, or kernel
parameter with User Mode Linux
:-h/--help: Show help options
diff --git a/tools/test-runner.c b/tools/test-runner.c
index 0bca31a46351..a2105977c1ee 100644
--- a/tools/test-runner.c
+++ b/tools/test-runner.c
@@ -128,20 +128,25 @@ static void strv_cleanup(struct strv *s)
for (i = 0; i < s->i; ++i)
free(s->strv[i]);
memset(s, 0, sizeof(*s));
}
static const char *qemu_table[] = {
+#if defined(__aarch64__)
+ "qemu-system-aarch64",
+ "/usr/bin/qemu-system-aarch64",
+#else
"qemu-system-x86_64",
"qemu-system-i386",
"/usr/bin/qemu-system-x86_64",
"/usr/bin/qemu-system-i386",
+#endif
NULL
};
static const char *find_qemu(void)
{
int i;
for (i = 0; qemu_table[i]; i++) {
@@ -150,21 +155,26 @@ static const char *find_qemu(void)
if (!stat(qemu_table[i], &st))
return qemu_table[i];
}
return NULL;
}
static const char *kernel_table[] = {
+#if defined(__aarch64__)
+ "Image",
+ "arch/arm64/boot/Image",
+#else
"bzImage",
"arch/x86/boot/bzImage",
"vmlinux",
"arch/x86/boot/vmlinux",
"linux",
+#endif
NULL
};
/* A User Mode Linux kernel is an executable with the .uml.setup.init
* section, through which it registers its command line options.
*/
static bool is_uml_kernel(const char *path)
{
@@ -420,16 +430,19 @@ static char *const qemu_envp[] = {
static void check_virtualization(void)
{
#ifdef HAVE_GET_CPUID
unsigned int eax, ebx, ecx, edx;
if (__get_cpuid(1, &eax, &ebx, &ecx, &edx) && (ecx & (1 << 5)))
printf("Found support for Virtual Machine eXtensions\n");
+#elif defined(__aarch64__)
+ if (access("/dev/kvm", R_OK | W_OK) < 0)
+ fprintf(stderr, "No access to /dev/kvm, falling back to TCG\n");
#endif
}
#define PCI_DEVICES_PATH "/sys/bus/pci/devices"
static char pcie_bdf[16];
static char pcie_driver[64];
@@ -894,16 +907,18 @@ static void qemu_signal(int sig)
if (qemu_pid > 0)
kill(qemu_pid, sig);
}
static int start_qemu(void)
{
char cwd[PATH_MAX/2], initcmd[PATH_MAX], testargs[PATH_MAX];
const char *fscmdline;
+ const char *earlycon;
+ const char *noacpi;
char cmdline[CMDLINE_MAX];
char *argv_strv[EXTRA_OPT_MAX + 64];
struct strv _cleanup_(strv_cleanup) argv = { argv_strv,
ARRAY_SIZE(argv_strv) };
struct rootfs _cleanup_(rootfs_cleanup) rootfs = {{0}};
int i, pos, status = 0;
pid_t pid;
@@ -933,54 +948,71 @@ static int start_qemu(void)
}
if (!virtiofsd)
fscmdline = "rootfstype=9p "
"rootflags=trans=virtio,version=9p2000.u";
else
fscmdline = "rootfstype=virtiofs root=/dev/root";
+#if defined(__aarch64__)
+ earlycon = "earlycon";
+ noacpi = "";
+#else
+ earlycon = "earlyprintk=serial";
+ /* PCIe passthrough requires ACPI and APIC for device enumeration
+ * and MSI interrupts.
+ */
+ noacpi = pcie_dev ? "" : "acpi=off pci=noacpi noapic";
+#endif
+
snprintf(cmdline, sizeof(cmdline),
- "console=hvc0 earlyprintk=serial "
+ "console=hvc0 %s "
"no_hash_pointers=1 %s %s quiet ro init=%s "
"TESTHOME=%s TESTDBUS=%u TESTDAEMON=%u "
"TESTDBUSSESSION=%u XDG_RUNTIME_DIR=/run/user/0 "
"TESTMONITOR=%u TESTEMULATOR=%u TESTDEVS=%d "
"TESTAUTO=%u TESTAUDIO='%s' TESTARGS=\'%s\'",
+ earlycon,
fscmdline,
- /* PCIe passthrough requires ACPI and APIC for
- * device enumeration and MSI interrupts.
- */
- pcie_dev ? "" : "acpi=off pci=noacpi noapic",
+ noacpi,
initcmd, cwd, start_dbus, start_daemon,
start_dbus_session,
start_monitor, num_emulator, num_devs,
run_auto, audio_server ? audio_server : "",
testargs);
/* Make sure qemu_binary is not null */
if (!qemu_binary) {
fprintf(stderr, "No QEMU binary is set\n");
return EXIT_FAILURE;
}
strv_append(&argv, "%s", qemu_binary);
strv_concat(&argv, qemu_argv);
+#if defined(__aarch64__)
+ strv_append(&argv, "-machine");
+ strv_append(&argv, "virt,gic-version=max,accel=kvm:tcg");
+
+ strv_append(&argv, "-cpu");
+ strv_append(&argv, qemu_host_cpu ? "host" : "max");
+#else
/* Interrupt remapping is required to pass through a device using
* MSI-X, which in turn needs the split irqchip.
*/
strv_append(&argv, "-machine");
strv_append(&argv, "type=q35,accel=kvm:tcg%s",
pcie_dev ? ",kernel-irqchip=split" : "");
if (qemu_host_cpu) {
strv_append(&argv, "-cpu");
strv_append(&argv, "host");
}
+#endif
strv_append(&argv, "-kernel");
strv_append(&argv, "%s", kernel_image);
strv_append(&argv, "-append");
strv_append(&argv, "%s", cmdline);
coverage_setup(&argv, cwd);
@@ -994,18 +1026,20 @@ static int start_qemu(void)
if (usb_dev) {
strv_append(&argv, "-device");
strv_append(&argv, "qemu-xhci");
strv_append(&argv, "-device");
strv_append(&argv, "%s", usb_dev);
}
if (pcie_dev) {
+#if !defined(__aarch64__)
strv_append(&argv, "-device");
strv_append(&argv, "intel-iommu,intremap=on");
+#endif
strv_append(&argv, "-device");
strv_append(&argv, "%s", pcie_dev);
}
if (!rootfs_setup(&rootfs, &argv))
return EXIT_FAILURE;
for (i = 0; i < num_extra_opts; ++i)
@@ -2193,18 +2227,19 @@ static void usage(void)
"\t-m, --monitor Start btmon\n"
"\t-l, --emulator[=num] Start btvirt\n"
"\t-A, --audio[=path] Start audio server\n"
"\t-u, --unix[=path] Provide serial device\n"
"\t-U, --usb <qemu_args> Provide USB device\n"
"\t-P, --pcie <qemu_args> Provide PCIe device\n"
"\t-q, --qemu <path> QEMU binary\n"
"\t-H, --qemu-host-cpu Use host CPU (requires KVM support)\n"
- "\t-k, --kernel <image> Kernel bzImage, User Mode Linux\n"
- "\t binary or source tree path\n"
+ "\t-k, --kernel <image> Kernel image or source tree path,\n"
+ "\t x86: bzImage or User Mode Linux\n"
+ "\t arm64: Image\n"
"\t-F, --virtiofs[=<path>] Virtiofsd path or 'no'\n"
"\t-T, --time-travel Run User Mode Linux on simulated\n"
"\t time, with btvirt as calendar\n"
"\t (default if supported)\n"
"\t-R, --real-time Run User Mode Linux on real time\n"
"\t-o, --option <opt> Additional argument passed to QEMU,\n"
"\t or kernel parameter with User\n"
"\t Mode Linux\n"
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH bluez 3/3] tools/test-runner: Allow suppressing noisy bluetoothd debug output
2026-11-22 10:34 [PATCH bluez 0/3] tools/test-runner: Add arm64 host support Zijun Hu
2026-11-22 10:34 ` [PATCH bluez 1/3] doc/test-runner: s/CONFIG_BT_HCIBTINTEL_PCIE/CONFIG_BT_INTEL_PCIE/ Zijun Hu
2026-11-22 10:34 ` [PATCH bluez 2/3] tools/test-runner: Support running on arm64 hosts Zijun Hu
@ 2026-11-22 10:34 ` Zijun Hu
2 siblings, 0 replies; 5+ messages in thread
From: Zijun Hu @ 2026-11-22 10:34 UTC (permalink / raw)
To: Linux Bluetooth; +Cc: Marcel Holtmann, Luiz Augusto von Dentz, Zijun Hu
test-runner always starts bluetoothd with -d, which floods the console
with debug output when only the test output is of interest.
Add an optional bluetoothd run mode to -d, e.g. -d2:
- 1: --nodetach -d [-f src/main.conf] (default)
- 2: --nodetach [-f src/main.conf]
Also make supporting other run modes easier in the future.
Existing usage in doc/test-runner.rst still works since -d without a
mode behaves as before.
Assisted-by: Claude:claude-opus-5-5
---
doc/test-runner.rst | 16 ++++++++++++-
tools/test-runner.c | 65 +++++++++++++++++++++++++++++++++++++++--------------
2 files changed, 63 insertions(+), 18 deletions(-)
diff --git a/doc/test-runner.rst b/doc/test-runner.rst
index 4ff9d1b02c1b..b9dc4f1f45a1 100644
--- a/doc/test-runner.rst
+++ b/doc/test-runner.rst
@@ -12,17 +12,20 @@ it launches a virtual machine using qemu(1) with the host filesystem mounted
read-only inside the guest.
OPTIONS
=======
:-a:--auto: Find tests and run them
:-b/--dbus: Start D-Bus system daemon
:-s/--dbus-session: Start D-Bus session daemon
-:-d/--daemon: Start bluetoothd
+:-d/--daemon[=mode]: Start bluetoothd, mode (default 1):
+
+ | 1: --nodetach -d [-f src/main.conf]
+ | 2: --nodetach [-f src/main.conf]
:-m/--monitor: Start btmon
:-l/--emulator[=num]: Start btvirt
:-A/-audio[=path]: Start audio server
:-u/--unix[=path]: Provide serial device
:-U/--usb=<qemu_args>: Provide USB device
:-P/--pcie=<qemu_args>: Provide PCIe device
:-q/--qemu=<path>: QEMU binary
:-H/--qemu-host-cpu: Use host CPU (requires KVM support)
@@ -359,16 +362,27 @@ Running bluetoothctl with emulated controller and audio support
Running shell with host controller using btproxy
------------------------------------------------
.. code-block::
$ tools/btproxy -u [1]
$ tools/test-runner -u -d -k /pathto/bzImage -- /bin/bash [2]
+Running bluetoothctl with host controller using btproxy for normal output
+--------------------------------------------------------------------------
+
+With -d2, bluetoothd is started without -d, so the bluetoothctl console
+is not flooded with debug output:
+
+.. code-block::
+
+ $ tools/btproxy -u [1]
+ $ tools/test-runner -u -d2 -k /pathto/bzImage -- client/bluetoothctl [2]
+
Running shell with host controller USB-passthrough
--------------------------------------------------
In addition the above kernel config option the following is required:
.. code-block::
CONFIG_USB=y
diff --git a/tools/test-runner.c b/tools/test-runner.c
index a2105977c1ee..bcfa4b2971ff 100644
--- a/tools/test-runner.c
+++ b/tools/test-runner.c
@@ -50,25 +50,26 @@
#endif
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
#define _cleanup_(f) __attribute__((cleanup(f)))
#define CMDLINE_MAX (2048 * 10)
#define EXTRA_OPT_MAX 64
+#define DAEMON_MODE_MAX 3
static const char *own_binary;
static char **test_argv;
static int test_argc;
static bool run_auto = false;
static bool start_dbus = false;
static bool start_dbus_session;
-static bool start_daemon = false;
+static unsigned int start_daemon;
static bool start_monitor = false;
static bool qemu_host_cpu = false;
/* Simulated time with User Mode Linux: -1 if supported by the kernel */
static int time_travel = -1;
static int num_devs = 0;
static int num_emulator = 0;
static const char *device_path = "/tmp/bt-server-bredr";
static const char *qemu_binary = NULL;
@@ -1578,17 +1579,17 @@ static const char *daemon_table[] = {
"/usr/sbin/bluetoothd",
"/usr/libexec/bluetooth/bluetoothd",
NULL
};
static pid_t start_bluetooth_daemon(const char *home)
{
const char *daemon = NULL;
- char *argv[6], *envp[2];
+ char *argv[6] = { NULL }, *envp[2];
pid_t pid;
struct stat st;
int i;
if (chdir(home + 5) < 0) {
perror("Failed to change home directory for daemon");
return -1;
}
@@ -1603,25 +1604,40 @@ static pid_t start_bluetooth_daemon(const char *home)
if (!daemon) {
fprintf(stderr, "Failed to locate Bluetooth daemon binary\n");
return -1;
}
printf("Using Bluetooth daemon %s\n", daemon);
- argv[0] = (char *) daemon;
- argv[1] = "--nodetach";
- argv[2] = "-d";
- argv[3] = NULL;
+ i = 0;
+ argv[i++] = (char *) daemon;
- if (!stat("src/main.conf", &st)) {
- argv[3] = "-f";
- argv[4] = "src/main.conf";
- argv[5] = NULL;
+ switch (start_daemon) {
+ case 1:
+ argv[i++] = "--nodetach";
+ argv[i++] = "-d";
+
+ if (!stat("src/main.conf", &st)) {
+ argv[i++] = "-f";
+ argv[i++] = "src/main.conf";
+ }
+ break;
+ case 2:
+ argv[i++] = "--nodetach";
+
+ if (!stat("src/main.conf", &st)) {
+ argv[i++] = "-f";
+ argv[i++] = "src/main.conf";
+ }
+ break;
+ default:
+ fprintf(stderr, "Invalid daemon mode %u\n", start_daemon);
+ return -1;
}
envp[0] = "DBUS_SYSTEM_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket";
envp[1] = NULL;
printf("Starting Bluetooth daemon\n");
pid = fork();
@@ -2165,20 +2181,21 @@ static void run_tests(void)
}
ptr = strstr(cmdline, "TESTDBUSSESSION=1");
if (ptr) {
printf("D-Bus session daemon requested\n");
start_dbus_session = true;
}
- ptr = strstr(cmdline, "TESTDAEMON=1");
+ ptr = strstr(cmdline, "TESTDAEMON=");
if (ptr) {
- printf("bluetoothd requested\n");
- start_daemon = true;
+ start_daemon = strtoul(ptr + 11, NULL, 0);
+ if (start_daemon)
+ printf("bluetoothd mode %u requested\n", start_daemon);
}
ptr = strstr(cmdline, "TESTMONITOR=1");
if (ptr) {
printf("Monitor requested\n");
start_monitor = true;
}
@@ -2218,17 +2235,19 @@ static void usage(void)
{
printf("test-runner - Automated test execution utility\n"
"Usage:\n");
printf("\ttest-runner [options] [--] <command> [args]\n");
printf("Options:\n"
"\t-a, --all,--auto Find tests and run them\n"
"\t-b, --dbus Start D-Bus system daemon\n"
"\t-s, --dbus-session Start D-Bus session daemon\n"
- "\t-d, --daemon Start bluetoothd\n"
+ "\t-d, --daemon[=mode] Start bluetoothd, mode (default 1):\n"
+ "\t 1: --nodetach -d [-f src/main.conf]\n"
+ "\t 2: --nodetach [-f src/main.conf]\n"
"\t-m, --monitor Start btmon\n"
"\t-l, --emulator[=num] Start btvirt\n"
"\t-A, --audio[=path] Start audio server\n"
"\t-u, --unix[=path] Provide serial device\n"
"\t-U, --usb <qemu_args> Provide USB device\n"
"\t-P, --pcie <qemu_args> Provide PCIe device\n"
"\t-q, --qemu <path> QEMU binary\n"
"\t-H, --qemu-host-cpu Use host CPU (requires KVM support)\n"
@@ -2247,17 +2266,17 @@ static void usage(void)
}
static const struct option main_options[] = {
{ "all", no_argument, NULL, 'a' },
{ "auto", no_argument, NULL, 'a' },
{ "dbus", no_argument, NULL, 'b' },
{ "dbus-session", no_argument, NULL, 's' },
{ "unix", optional_argument, NULL, 'u' },
- { "daemon", no_argument, NULL, 'd' },
+ { "daemon", optional_argument, NULL, 'd' },
{ "emulator", no_argument, NULL, 'l' },
{ "monitor", no_argument, NULL, 'm' },
{ "qemu", required_argument, NULL, 'q' },
{ "qemu-host-cpu", no_argument, NULL, 'H' },
{ "kernel", required_argument, NULL, 'k' },
{ "audio", optional_argument, NULL, 'A' },
{ "usb", required_argument, NULL, 'U' },
{ "pcie", required_argument, NULL, 'P' },
@@ -2288,17 +2307,17 @@ int main(int argc, char *argv[])
reboot(RB_AUTOBOOT);
return EXIT_SUCCESS;
}
for (;;) {
int opt;
opt = getopt_long(argc, argv,
- "au::bdsl::mq:Hk:A::U:P:o:F::TRvh",
+ "au::bd::sl::mq:Hk:A::U:P:o:F::TRvh",
main_options, NULL);
if (opt < 0)
break;
switch (opt) {
case 'a':
run_auto = true;
break;
@@ -2310,17 +2329,29 @@ int main(int argc, char *argv[])
case 'b':
start_dbus = true;
break;
case 's':
start_dbus_session = true;
break;
case 'd':
start_dbus = true;
- start_daemon = true;
+ start_daemon = 1;
+ if (optarg) {
+ char *endptr;
+
+ start_daemon = strtoul(optarg, &endptr, 0);
+ if (start_daemon >= DAEMON_MODE_MAX ||
+ *endptr) {
+ fprintf(stderr,
+ "Invalid daemon mode %s\n",
+ optarg);
+ return EXIT_FAILURE;
+ }
+ }
break;
case 'l':
num_emulator = optarg ? atoi(optarg) : 1;
break;
case 'm':
start_monitor = true;
break;
case 'q':
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH bluez 2/3] tools/test-runner: Support running on arm64 hosts
2026-11-22 10:34 ` [PATCH bluez 2/3] tools/test-runner: Support running on arm64 hosts Zijun Hu
@ 2026-11-22 16:24 ` Pauli Virtanen
0 siblings, 0 replies; 5+ messages in thread
From: Pauli Virtanen @ 2026-11-22 16:24 UTC (permalink / raw)
To: linux-bluetooth
Hi,
su, 2026-11-22 kello 02:34 -0800, Zijun Hu kirjoitti:
> Add arm64 support by:
> - Using qemu-system-aarch64 with the virt machine and the arm64 Image
> - Passing -cpu max or host, as the default virt CPU is 32-bit
> - Using earlycon and leaving out the x86-only options
> - Warning when /dev/kvm is not accessible, as QEMU then falls back
> to TCG
Should it actually determine whether to run qemu x86 vs aarch based on
what the kernel image is, and not the host system this is compiled for?
> Assisted-by: Claude:claude-opus-5-5
> ---
> doc/test-runner.rst | 5 ++++-
> tools/test-runner.c | 49 ++++++++++++++++++++++++++++++++++++++++++-------
> 2 files changed, 46 insertions(+), 8 deletions(-)
>
> diff --git a/doc/test-runner.rst b/doc/test-runner.rst
> index b5876e4f5108..4ff9d1b02c1b 100644
> --- a/doc/test-runner.rst
> +++ b/doc/test-runner.rst
> @@ -21,17 +21,20 @@ OPTIONS
> :-m/--monitor: Start btmon
> :-l/--emulator[=num]: Start btvirt
> :-A/-audio[=path]: Start audio server
> :-u/--unix[=path]: Provide serial device
> :-U/--usb=<qemu_args>: Provide USB device
> :-P/--pcie=<qemu_args>: Provide PCIe device
> :-q/--qemu=<path>: QEMU binary
> :-H/--qemu-host-cpu: Use host CPU (requires KVM support)
> -:-k/--kernel=<image>: Kernel image (bzImage) or User Mode Linux binary
> +:-k/--kernel=<image>: Kernel image or source tree path:
> +
> + | x86: bzImage or User Mode Linux binary
> + | arm64: Image
> :-F/--virtiofs[=<path>]: Path to virtiofsd, or no to disable virtio-fs
> :-T/--time-travel: Run a User Mode Linux kernel on simulated time, with
> btvirt as time travel calendar (default if the kernel supports it)
> :-R/--real-time: Run a User Mode Linux kernel on real time
> :-o/--option=<opt>: Additional argument passed to QEMU, or kernel
> parameter with User Mode Linux
> :-h/--help: Show help options
>
> diff --git a/tools/test-runner.c b/tools/test-runner.c
> index 0bca31a46351..a2105977c1ee 100644
> --- a/tools/test-runner.c
> +++ b/tools/test-runner.c
> @@ -128,20 +128,25 @@ static void strv_cleanup(struct strv *s)
>
> for (i = 0; i < s->i; ++i)
> free(s->strv[i]);
>
> memset(s, 0, sizeof(*s));
> }
>
> static const char *qemu_table[] = {
> +#if defined(__aarch64__)
> + "qemu-system-aarch64",
> + "/usr/bin/qemu-system-aarch64",
> +#else
> "qemu-system-x86_64",
> "qemu-system-i386",
> "/usr/bin/qemu-system-x86_64",
> "/usr/bin/qemu-system-i386",
> +#endif
> NULL
> };
>
> static const char *find_qemu(void)
> {
> int i;
>
> for (i = 0; qemu_table[i]; i++) {
> @@ -150,21 +155,26 @@ static const char *find_qemu(void)
> if (!stat(qemu_table[i], &st))
> return qemu_table[i];
> }
>
> return NULL;
> }
>
> static const char *kernel_table[] = {
> +#if defined(__aarch64__)
> + "Image",
> + "arch/arm64/boot/Image",
> +#else
> "bzImage",
> "arch/x86/boot/bzImage",
> "vmlinux",
> "arch/x86/boot/vmlinux",
> "linux",
> +#endif
> NULL
> };
>
> /* A User Mode Linux kernel is an executable with the .uml.setup.init
> * section, through which it registers its command line options.
> */
> static bool is_uml_kernel(const char *path)
> {
> @@ -420,16 +430,19 @@ static char *const qemu_envp[] = {
>
> static void check_virtualization(void)
> {
> #ifdef HAVE_GET_CPUID
> unsigned int eax, ebx, ecx, edx;
>
> if (__get_cpuid(1, &eax, &ebx, &ecx, &edx) && (ecx & (1 << 5)))
> printf("Found support for Virtual Machine eXtensions\n");
> +#elif defined(__aarch64__)
> + if (access("/dev/kvm", R_OK | W_OK) < 0)
> + fprintf(stderr, "No access to /dev/kvm, falling back to TCG\n");
> #endif
> }
>
> #define PCI_DEVICES_PATH "/sys/bus/pci/devices"
>
> static char pcie_bdf[16];
> static char pcie_driver[64];
>
> @@ -894,16 +907,18 @@ static void qemu_signal(int sig)
> if (qemu_pid > 0)
> kill(qemu_pid, sig);
> }
>
> static int start_qemu(void)
> {
> char cwd[PATH_MAX/2], initcmd[PATH_MAX], testargs[PATH_MAX];
> const char *fscmdline;
> + const char *earlycon;
> + const char *noacpi;
> char cmdline[CMDLINE_MAX];
> char *argv_strv[EXTRA_OPT_MAX + 64];
> struct strv _cleanup_(strv_cleanup) argv = { argv_strv,
> ARRAY_SIZE(argv_strv) };
> struct rootfs _cleanup_(rootfs_cleanup) rootfs = {{0}};
> int i, pos, status = 0;
> pid_t pid;
>
> @@ -933,54 +948,71 @@ static int start_qemu(void)
> }
>
> if (!virtiofsd)
> fscmdline = "rootfstype=9p "
> "rootflags=trans=virtio,version=9p2000.u";
> else
> fscmdline = "rootfstype=virtiofs root=/dev/root";
>
> +#if defined(__aarch64__)
> + earlycon = "earlycon";
> + noacpi = "";
> +#else
> + earlycon = "earlyprintk=serial";
> + /* PCIe passthrough requires ACPI and APIC for device enumeration
> + * and MSI interrupts.
> + */
> + noacpi = pcie_dev ? "" : "acpi=off pci=noacpi noapic";
> +#endif
> +
> snprintf(cmdline, sizeof(cmdline),
> - "console=hvc0 earlyprintk=serial "
> + "console=hvc0 %s "
> "no_hash_pointers=1 %s %s quiet ro init=%s "
> "TESTHOME=%s TESTDBUS=%u TESTDAEMON=%u "
> "TESTDBUSSESSION=%u XDG_RUNTIME_DIR=/run/user/0 "
> "TESTMONITOR=%u TESTEMULATOR=%u TESTDEVS=%d "
> "TESTAUTO=%u TESTAUDIO='%s' TESTARGS=\'%s\'",
> + earlycon,
> fscmdline,
> - /* PCIe passthrough requires ACPI and APIC for
> - * device enumeration and MSI interrupts.
> - */
> - pcie_dev ? "" : "acpi=off pci=noacpi noapic",
> + noacpi,
> initcmd, cwd, start_dbus, start_daemon,
> start_dbus_session,
> start_monitor, num_emulator, num_devs,
> run_auto, audio_server ? audio_server : "",
> testargs);
>
> /* Make sure qemu_binary is not null */
> if (!qemu_binary) {
> fprintf(stderr, "No QEMU binary is set\n");
> return EXIT_FAILURE;
> }
>
> strv_append(&argv, "%s", qemu_binary);
> strv_concat(&argv, qemu_argv);
>
> +#if defined(__aarch64__)
> + strv_append(&argv, "-machine");
> + strv_append(&argv, "virt,gic-version=max,accel=kvm:tcg");
> +
> + strv_append(&argv, "-cpu");
> + strv_append(&argv, qemu_host_cpu ? "host" : "max");
> +#else
> /* Interrupt remapping is required to pass through a device using
> * MSI-X, which in turn needs the split irqchip.
> */
> strv_append(&argv, "-machine");
> strv_append(&argv, "type=q35,accel=kvm:tcg%s",
> pcie_dev ? ",kernel-irqchip=split" : "");
>
> if (qemu_host_cpu) {
> strv_append(&argv, "-cpu");
> strv_append(&argv, "host");
> }
> +#endif
>
> strv_append(&argv, "-kernel");
> strv_append(&argv, "%s", kernel_image);
> strv_append(&argv, "-append");
> strv_append(&argv, "%s", cmdline);
>
> coverage_setup(&argv, cwd);
>
> @@ -994,18 +1026,20 @@ static int start_qemu(void)
> if (usb_dev) {
> strv_append(&argv, "-device");
> strv_append(&argv, "qemu-xhci");
> strv_append(&argv, "-device");
> strv_append(&argv, "%s", usb_dev);
> }
>
> if (pcie_dev) {
> +#if !defined(__aarch64__)
> strv_append(&argv, "-device");
> strv_append(&argv, "intel-iommu,intremap=on");
> +#endif
> strv_append(&argv, "-device");
> strv_append(&argv, "%s", pcie_dev);
> }
>
> if (!rootfs_setup(&rootfs, &argv))
> return EXIT_FAILURE;
>
> for (i = 0; i < num_extra_opts; ++i)
> @@ -2193,18 +2227,19 @@ static void usage(void)
> "\t-m, --monitor Start btmon\n"
> "\t-l, --emulator[=num] Start btvirt\n"
> "\t-A, --audio[=path] Start audio server\n"
> "\t-u, --unix[=path] Provide serial device\n"
> "\t-U, --usb <qemu_args> Provide USB device\n"
> "\t-P, --pcie <qemu_args> Provide PCIe device\n"
> "\t-q, --qemu <path> QEMU binary\n"
> "\t-H, --qemu-host-cpu Use host CPU (requires KVM support)\n"
> - "\t-k, --kernel <image> Kernel bzImage, User Mode Linux\n"
> - "\t binary or source tree path\n"
> + "\t-k, --kernel <image> Kernel image or source tree path,\n"
> + "\t x86: bzImage or User Mode Linux\n"
> + "\t arm64: Image\n"
> "\t-F, --virtiofs[=<path>] Virtiofsd path or 'no'\n"
> "\t-T, --time-travel Run User Mode Linux on simulated\n"
> "\t time, with btvirt as calendar\n"
> "\t (default if supported)\n"
> "\t-R, --real-time Run User Mode Linux on real time\n"
> "\t-o, --option <opt> Additional argument passed to QEMU,\n"
> "\t or kernel parameter with User\n"
> "\t Mode Linux\n"
--
Pauli Virtanen
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-11-22 16:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-22 10:34 [PATCH bluez 0/3] tools/test-runner: Add arm64 host support Zijun Hu
2026-11-22 10:34 ` [PATCH bluez 1/3] doc/test-runner: s/CONFIG_BT_HCIBTINTEL_PCIE/CONFIG_BT_INTEL_PCIE/ Zijun Hu
2026-11-22 10:34 ` [PATCH bluez 2/3] tools/test-runner: Support running on arm64 hosts Zijun Hu
2026-11-22 16:24 ` Pauli Virtanen
2026-11-22 10:34 ` [PATCH bluez 3/3] tools/test-runner: Allow suppressing noisy bluetoothd debug output Zijun Hu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox