diff options
author | Michael S. Tsirkin | 2018-01-11 21:01:17 +0100 |
---|---|---|
committer | Michael S. Tsirkin | 2018-01-11 21:03:50 +0100 |
commit | acc95bc85036c443da8bf7159a77edf9f00dcd80 (patch) | |
tree | 21965c6e60a2e29664b7685e52feacdb6a86e0bd /include/hw/misc/pvpanic.h | |
parent | smbus: do not immediately complete commands (diff) | |
parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180111'... (diff) | |
download | qemu-acc95bc85036c443da8bf7159a77edf9f00dcd80.tar.gz qemu-acc95bc85036c443da8bf7159a77edf9f00dcd80.tar.xz qemu-acc95bc85036c443da8bf7159a77edf9f00dcd80.zip |
Merge remote-tracking branch 'origin/master' into HEAD
Resolve conflicts around apb.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'include/hw/misc/pvpanic.h')
-rw-r--r-- | include/hw/misc/pvpanic.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h new file mode 100644 index 0000000000..36a54e270c --- /dev/null +++ b/include/hw/misc/pvpanic.h @@ -0,0 +1,21 @@ +/* + * QEMU simulated pvpanic device. + * + * Copyright Fujitsu, Corp. 2013 + * + * Authors: + * Wen Congyang <wency@cn.fujitsu.com> + * Hu Tao <hutao@cn.fujitsu.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ +#ifndef HW_MISC_PVPANIC_H +#define HW_MISC_PVPANIC_H + +#define TYPE_PVPANIC "pvpanic" + +uint16_t pvpanic_port(void); + +#endif |