diff options
| author | Peter Maydell | 2018-02-12 14:00:03 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-02-12 14:00:03 +0100 |
| commit | 8e3fb8029efaf220ab48290cdb5151c682227030 (patch) | |
| tree | 6ac74cba11eb36e6b87dd51b4f9b406a0ad1baae /hw/core/machine.c | |
| parent | Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-02-09' into st... (diff) | |
| parent | tests/qapi: use ARRAY_SIZE macro (diff) | |
| download | qemu-8e3fb8029efaf220ab48290cdb5151c682227030.tar.gz qemu-8e3fb8029efaf220ab48290cdb5151c682227030.tar.xz qemu-8e3fb8029efaf220ab48290cdb5151c682227030.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2018-02-10
# gpg: Signature made Sat 10 Feb 2018 07:54:03 GMT
# gpg: using RSA key 701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* remotes/mjt/tags/trivial-patches-fetch:
tests/qapi: use ARRAY_SIZE macro
tests/qapi: use QEMU_IS_ALIGNED macro
tests/hbitmap: use ARRAY_SIZE macro
async: use ARRAY_SIZE macro
qga: use ARRAY_SIZE macro
MAINTAINERS: Add qemu-binfmt-conf.sh script
oslib-posix: check for posix_memalign in configure script
maint: Mention web site maintenance in README
build: fix typo in error message
configure: Allow capstone=git only if git update is not disabled
scripts/make-release: Don't archive .git files
qemu-options.hx: Remove confusing spaces in parameter listings
mailmap: set preferred spelling for Daniel Berrangé
Drop unneeded system header includes
machine: Polish -machine xxx,help
scripts/argparse.py: spelling (independant)
qapi-schema.json: spelling (independant comparation)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/machine.c')
| -rw-r--r-- | hw/core/machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index cdc1163dc6..5d445839e8 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -520,7 +520,7 @@ static void machine_class_init(ObjectClass *oc, void *data) object_class_property_set_description(oc, "accel", "Accelerator list", &error_abort); - object_class_property_add(oc, "kernel-irqchip", "OnOffSplit", + object_class_property_add(oc, "kernel-irqchip", "on|off|split", NULL, machine_set_kernel_irqchip, NULL, NULL, &error_abort); object_class_property_set_description(oc, "kernel-irqchip", |