diff options
author | Anthony Liguori | 2013-09-23 18:52:55 +0200 |
---|---|---|
committer | Anthony Liguori | 2013-09-23 18:52:55 +0200 |
commit | 2e6ae666c8ccaa7fd26d7102c5c9bed24dc02b1d (patch) | |
tree | 506ea140053974266577f7563998d7173cd5905d /hw/pci-host/q35.c | |
parent | Merge remote-tracking branch 'qemu-kvm/uq/master' into staging (diff) | |
parent | tests/.gitignore: ignore test-throttle (diff) | |
download | qemu-2e6ae666c8ccaa7fd26d7102c5c9bed24dc02b1d.tar.gz qemu-2e6ae666c8ccaa7fd26d7102c5c9bed24dc02b1d.tar.xz qemu-2e6ae666c8ccaa7fd26d7102c5c9bed24dc02b1d.zip |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Stefan Weil (8) and others
# Via Michael Tokarev
* mjt/trivial-patches:
tests/.gitignore: ignore test-throttle
exec: Fix broken build for MinGW (regression)
kvm: Fix compiler warning (clang)
tcg-sparc: Fix parenthesis warning
Makefile: Remove some more files when cleaning
target-i386: Fix segment cache dump
iov: avoid "orig_len may be used unitialized" warning
vscclient: remove unnecessary use of uninitialized variable
trace-events: Clean up with scripts/cleanup-trace-events.pl again
tci: Fix qemu-alpha on 32 bit hosts (wrong assertions)
*-user: Improve documentation for lock_user function
MAINTAINERS: Add missing entry to filelist for TCI target
translate-all: Fix formatting of dump output
*-user: Fix typo in comment (ulocking -> unlocking)
docs: Fix IO port number for CPU present bitmap.
q35: Fix typo in constant DEFUALT -> DEFAULT.
configure: Undefine _FORTIFY_SOURCE prior using it
Message-id: 1379696296-32105-1-git-send-email-mjt@msgid.tls.msk.ru
Diffstat (limited to 'hw/pci-host/q35.c')
-rw-r--r-- | hw/pci-host/q35.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 54735043b7..0cb652d7f0 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -372,7 +372,7 @@ static void mch_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_mch; k->vendor_id = PCI_VENDOR_ID_INTEL; k->device_id = PCI_DEVICE_ID_INTEL_Q35_MCH; - k->revision = MCH_HOST_BRIDGE_REVISION_DEFUALT; + k->revision = MCH_HOST_BRIDGE_REVISION_DEFAULT; k->class_id = PCI_CLASS_BRIDGE_HOST; } |