Compilation fixes following merge.

diff --git a/hw/pci_emulation.c b/hw/pci_emulation.c
index 0a4a7b452b8b37e742a6a8f2b80121906e5eb998..a7fdfb1ae3dc9ebd232fcc5fc44b7024369e7f8d 100644 (file)
--- a/hw/pci_emulation.c
+++ b/hw/pci_emulation.c
@@ -2,7 +2,11 @@
  * Changes to PCI emulation made by Marathon Technologies, June 2008
  */
 
-#include "vl.h"
+#include "qemu-common.h"
+#include "hw.h"
+
+#include "pci.h"
+#include "pci_emulation.h"
 
 typedef struct {
     PCIDevice dev;

diff --git a/hw/pci_emulation.h b/hw/pci_emulation.h
index abb7572fcec161f1bb2314a2e48cdf630adb263c..85b24da91922e417d54ece1d9c041e40812364c9 100644 (file)
--- a/hw/pci_emulation.h
+++ b/hw/pci_emulation.h
@@ -2,6 +2,9 @@
  * Changes to PCI emulation made by Marathon Technologies, June 2008
  */
 
+#ifndef PCI_EMULATION_H
+#define PCI_EMULATION_H
+
 typedef struct PCI_EMULATION_INFO_t {
     struct PCI_EMULATION_INFO_t *next;
     char name[32];
@@ -22,3 +25,5 @@ void parse_pci_emulation_info(char *config_text, PCI_EMULATION_INFO *pci_emulati
 void pci_emulation_init(PCIBus *bus, PCI_EMULATION_INFO *pci_emulation_info);
 
 extern PCI_EMULATION_INFO *PciEmulationInfoHead;
+
+#endif /*PCI_EMULATION_H*/

diff --git a/hw/usb.h b/hw/usb.h
index e3859334da4e646b4d23714d6584e4eae4c35083..2fddc86991d705d84c3c83367b1aceb48fad8b0a 100644 (file)
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -21,6 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
+#include "block.h"
+
 #define USB_TOKEN_SETUP 0x2d
 #define USB_TOKEN_IN    0x69 /* device -> host */
 #define USB_TOKEN_OUT   0xe1 /* host -> device */

diff --git a/vl.c b/vl.c
index df0bfe425f856c7850a57de84172c82c9dbb4620..1b6bfb99c2b55ff2e35ab61caf307dad3aebc82a 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4739,18 +4739,6 @@ static int net_socket_mcast_init(VLANState *vlan, const char *host_str)
     if (parse_host_port(&saddr, host_str) < 0)
         return -1;
 
-static int pci_emulation_add(char *config_text)
-{
-    PCI_EMULATION_INFO *new;
-    if ((new = qemu_mallocz(sizeof(PCI_EMULATION_INFO))) == NULL) {
-        return -1;
-    }
-    parse_pci_emulation_info(config_text, new);
-    new->next = PciEmulationInfoHead;
-    PciEmulationInfoHead = new;
-    return 0;
-}
-
     fd = net_socket_mcast_create(&saddr);
     if (fd < 0)
        return -1;
@@ -4768,6 +4756,18 @@ static int pci_emulation_add(char *config_text)
 
 }
 
+static int pci_emulation_add(char *config_text)
+{
+    PCI_EMULATION_INFO *new;
+    if ((new = qemu_mallocz(sizeof(PCI_EMULATION_INFO))) == NULL) {
+        return -1;
+    }
+    parse_pci_emulation_info(config_text, new);
+    new->next = PciEmulationInfoHead;
+    PciEmulationInfoHead = new;
+    return 0;
+}
+
 static const char *get_opt_name(char *buf, int buf_size, const char *p)
 {
     char *q;
@@ -7581,7 +7581,7 @@ const QEMUOption qemu_options[] = {
 #endif
 #ifdef CONFIG_OPENGL
     { "disable-opengl", 0, QEMU_OPTION_disable_opengl },
-#endif CONFIG_OPENGL
+#endif
     { "vcpus", 1, QEMU_OPTION_vcpus },
     { "acpi", 0, QEMU_OPTION_acpi }, /* deprecated, for xend compatibility */
     { "direct_pci", HAS_ARG, QEMU_OPTION_direct_pci },

diff --git a/xen-config-host.h b/xen-config-host.h
index 15e7789c0393298aa69df6a95e0693ed855ecbff..c48e4524cde33be54ea462779cd72591f04c46f7 100644 (file)
--- a/xen-config-host.h
+++ b/xen-config-host.h
@@ -27,3 +27,6 @@ extern int vcpus;
 
 #define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup"
 #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/xen/qemu-ifdown"
+
+void xenstore_parse_domain_config(int domid);
+void xenstore_read_vncpasswd(int domid, char *pwbuf, size_t pwbuflen);