diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-06 13:24:35 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-06 13:24:35 +0000 |
| commit | b5fe11a49ad3df109bfb32dea2f2ef74d1d3ca13 (patch) | |
| tree | c9007e013761351acda3bbc000e36d192a180827 /hw/i386/pc_q35.c | |
| parent | 58e2e17dba49b43f4ac9de19468aeae1c787dcc2 (diff) | |
| parent | 3e015d815b3f28bfd874bf8a1697308ef9af2b4c (diff) | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* new QMP command qom-list-properties (Alexey)
* TCG cleanups (David)
* use g_path_get_basename/g_path_get_dirname when useful (Julia)
* WHPX fixes (Justin)
* ASAN fixes (Marc-André)
* g364fb memory leak fix, address_space_to_flatview RCU fixes (me)
* chardev memory leak fix (Peter)
* checkpatch improvements (Julia, Su Hang)
* next round of deprecation patches (Thomas)
# gpg: Signature made Tue 06 Mar 2018 13:11:58 GMT
# gpg: using RSA key BFFBD25F78C7AE83
# 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: (34 commits)
use g_path_get_basename instead of basename
balloon: Fix documentation of the --balloon parameter and deprecate it
WHPX improve interrupt notification registration
WHXP Removes the use of WHvGetExitContextSize
Fix WHPX issue leaking tpr values
Fix WHPX typo in 'mmio'
Fix WHPX additional lock acquisition
Remove unnecessary WHPX __debugbreak();
Resolves WHPX breaking changes in SDK 17095
Fixing WHPX casing to match SDK
Revert "build-sys: compile with -Og or -O1 when --enable-debug"
checkpatch: add check for `while` and `for`
checkpatch: add a warning for basename/dirname
address_space_rw: address_space_to_flatview needs RCU lock
address_space_map: address_space_to_flatview needs RCU lock
address_space_access_valid: address_space_to_flatview needs RCU lock
address_space_read: address_space_to_flatview needs RCU lock
address_space_write: address_space_to_flatview needs RCU lock
memory: inline some performance-sensitive accessors
openpic_kvm: drop address_space_to_flatview call
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386/pc_q35.c')
| -rw-r--r-- | hw/i386/pc_q35.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index aba7541a82..0c0bc48137 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -273,9 +273,6 @@ static void pc_q35_init(MachineState *machine) /* the rest devices to which pci devfn is automatically assigned */ pc_vga_init(isa_bus, host_bus); pc_nic_init(isa_bus, host_bus); - if (pcmc->pci_enabled) { - pc_pci_device_init(host_bus); - } if (pcms->acpi_nvdimm_state.is_enabled) { nvdimm_init_acpi_state(&pcms->acpi_nvdimm_state, system_io, |