diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-03-03 17:53:56 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-03-03 17:53:56 +0000 |
| commit | d9bafcd1db602b199dfffc8bcfef08f42f447d38 (patch) | |
| tree | e963fabd7bb928c092230b9d74adf8d91aa86685 /qemu-config.c | |
| parent | b3e54c689c0630e9a79f33a8b03c71296334fd36 (diff) | |
| parent | 0f58a1882bae42d7c76bdb66792c204a810ec01f (diff) | |
| download | hqemu-d9bafcd1db602b199dfffc8bcfef08f42f447d38.zip hqemu-d9bafcd1db602b199dfffc8bcfef08f42f447d38.tar.gz | |
Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
* 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm:
hw/arm11mpcore: Fix broken realview_mpcore/arm11mpcore_priv properties
arm: add device tree support
arm: make sure that number of irqs can be represented in GICD_TYPER.
arm: clean up GIC constants
Diffstat (limited to 'qemu-config.c')
| -rw-r--r-- | qemu-config.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qemu-config.c b/qemu-config.c index 7d9da78..be84a03 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -578,6 +578,10 @@ static QemuOptsList qemu_machine_opts = { .name = "append", .type = QEMU_OPT_STRING, .help = "Linux kernel command line", + }, { + .name = "dtb", + .type = QEMU_OPT_STRING, + .help = "Linux kernel device tree file", }, { /* End of list */ } }, |
