[PATCH 18/28] kvm tools: Initialise PCI before devices start getting

Matt Evans
2011-12-06T03:41:25Z

Re-arrange pci__init() in builtin-run such that it comes before devices are
initialised.

Signed-off-by: Matt Evans <matt@ozlabs.org>
---
tools/kvm/builtin-run.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c
index aaa5132..32e19e7 100644
--- a/tools/kvm/builtin-run.c
+++ b/tools/kvm/builtin-run.c
@@ -829,6 +829,8 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)

kvm->nrcpus = nrcpus;

+ pci__init();
+
/*
* vidmode should be either specified
* either set by default
@@ -896,8 +898,6 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)

serial8250__init(kvm);

- pci__init();
-
if (active_console = CONSOLE_VIRTIO)
virtio_console__init(kvm);