From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Tue, 24 Mar 2009 13:31:27 +0000 (+0000)
Subject: Fix getting the configuration of PCI pass-through from xenstore
X-Git-Tag: xen-3.4.0-rc2~34
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=601cf2c84e0107a1fd01a6888986b6b9442a5368;p=qemu-xen-3.4-testing.git

Fix getting the configuration of PCI pass-through from xenstore

This patch fixes getting the configuration of PCI pass-through from xenstore.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
Acked-by: Dexuan Cui <dexuan.cui@intel.com>
---

diff --git a/vl.c b/vl.c
index 01c24b73..5801e428 100644
--- a/vl.c
+++ b/vl.c
@@ -5783,6 +5783,9 @@ int main(int argc, char **argv, char **envp)
         }
     }
 
+    if (strlen(direct_pci_str) > 0)
+        direct_pci = direct_pci_str;
+
     machine->init(ram_size, vga_ram_size, boot_devices,
                   kernel_filename, kernel_cmdline, initrd_filename, cpu_model,
 		  direct_pci);
@@ -5903,9 +5906,6 @@ int main(int argc, char **argv, char **envp)
     }
 #endif
 
-    if (strlen(direct_pci_str) > 0)
-        direct_pci = direct_pci_str;
-
     for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) {
         const char *devname = virtio_consoles[i];
         if (virtcon_hds[i] && devname) {