diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-04-06 09:27:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-04-06 09:27:49 +0100 |
| commit | 54d689988c847271d87b3eb113712147129fb811 (patch) | |
| tree | 29698f0c769de5fa61fcc61a98c20a5701571861 /include | |
| parent | 1fde6ee885d3e778acb326cab9f7037939839537 (diff) | |
| parent | 8c9f42f3cf3598e8bb612b3f81cd12632efd3ca4 (diff) | |
| download | qemu-54d689988c847271d87b3eb113712147129fb811.zip qemu-54d689988c847271d87b3eb113712147129fb811.tar.gz qemu-54d689988c847271d87b3eb113712147129fb811.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* TCO watchdog fix
# gpg: Signature made Wed 05 Apr 2017 16:24:52 BST
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
tco: do not generate an NMI
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/ich9.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h index 18dcca7..673d13d 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/i386/ich9.h @@ -21,7 +21,6 @@ void ich9_lpc_pm_init(PCIDevice *pci_lpc, bool smm_enabled); I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base); void ich9_generate_smi(void); -void ich9_generate_nmi(void); #define ICH9_CC_SIZE (16 * 1024) /* 16KB. Chipset configuration registers */ |