Fix build warnings.

diff --git a/xen-3.4/fix-build-warnings b/xen-3.4/fix-build-warnings
new file mode 100644 (file)
index 0000000..cba9abc
--- /dev/null
+++ b/xen-3.4/fix-build-warnings
@@ -0,0 +1,180 @@
+diff --git a/hw/battery_mgmt.h b/hw/battery_mgmt.h
+index 4a4ac8e..19129b8 100644
+--- a/hw/battery_mgmt.h
++++ b/hw/battery_mgmt.h
+@@ -42,4 +42,12 @@ typedef struct battery_state_info {
+ 
+ void battery_mgmt_init(PCIDevice *device);
+ 
++#ifndef CONFIG_NO_BATTERY_MGMT
++int is_battery_pt_feasible(void);
++void battery_mgmt_pt_mode_init(void);
++void get_battery_data_from_xenstore(void);
++void write_battery_data_to_port(void);
++void battery_mgmt_non_pt_mode_init(PCIDevice *device);
++#endif
++
+ #endif
+diff --git a/hw/pci.h b/hw/pci.h
+index a48ac30..b27696e 100644
+--- a/hw/pci.h
++++ b/hw/pci.h
+@@ -156,9 +156,13 @@ typedef struct PCIIORegion {
+ #define PCI_STATUS_RESERVED1  0x007
+ #define PCI_STATUS_INT_STATUS 0x008
+ #define PCI_STATUS_CAPABILITIES       0x010
+-#define PCI_STATUS_66MHZ      0x020
++#ifndef PCI_STATUS_66MHZ
++#define PCI_STATUS_66MHZ        0x020
++#endif
+ #define PCI_STATUS_RESERVED2  0x040
+-#define PCI_STATUS_FAST_BACK  0x080
++#ifndef PCI_STATUS_FAST_BACK
++#define PCI_STATUS_FAST_BACK    0x080
++#endif
+ #define PCI_STATUS_DEVSEL     0x600
+ 
+ #define PCI_STATUS_RESERVED_MASK_LO (PCI_STATUS_RESERVED1 | \
+diff --git a/hw/piix4acpi.c b/hw/piix4acpi.c
+index 5383032..841986c 100644
+--- a/hw/piix4acpi.c
++++ b/hw/piix4acpi.c
+@@ -30,6 +30,8 @@
+ #include "qemu-xen.h"
+ #include "battery_mgmt.h"
+ #include "xen_acpi_wmi.h"
++#include "thermal_mgmt.h"
++#include "pass-through.h"
+ 
+ #include <xen/hvm/ioreq.h>
+ #include <xen/hvm/params.h>
+@@ -216,8 +218,6 @@ static inline void clear_bit(uint8_t *map, int bit)
+     map[bit / 8] &= ~(1 << (bit % 8));
+ }
+ 
+-extern FILE *logfile;
+-
+ void acpi_ac_adapter_state_changed(void)
+ {
+     GPEState *s = &gpe_state;
+diff --git a/hw/xen_acpi_wmi.c b/hw/xen_acpi_wmi.c
+index 5d378d0..e759e89 100644
+--- a/hw/xen_acpi_wmi.c
++++ b/hw/xen_acpi_wmi.c
+@@ -38,6 +38,7 @@
+ #include "qemu-xen.h"
+ #include "isa.h" 
+ #include "xen_acpi_wmi.h"
++#include <sys/ioctl.h>
+ 
+ #ifndef CONFIG_NO_XEN_ACPI_WMI
+ 
+@@ -46,7 +47,6 @@
+ static xen_acpi_wmi_cmd_info_t cmd_info;
+ static int xen_wmi_device = -ENODEV;  
+ extern FILE *logfile;
+-extern int domid;
+ 
+ /* #define XEN_ACPI_WMI_DEBUG */
+ /* #define XEN_ACPI_WMI_DEBUG_EXT */
+@@ -224,7 +224,7 @@ void xen_acpi_wmi_allocate_output_buffer(size_t length)
+ /*
+  * xen_acpi_wmi_reallocate_output_buffer
+  */
+-int xen_acpi_wmi_reallocate_output_buffer()
++int xen_acpi_wmi_reallocate_output_buffer(void)
+ {
+     xen_wmi_buffer_t *buffer;
+ 
+diff --git a/hw/xen_acpi_wmi.h b/hw/xen_acpi_wmi.h
+index 91e4c00..df289f2 100644
+--- a/hw/xen_acpi_wmi.h
++++ b/hw/xen_acpi_wmi.h
+@@ -61,6 +61,29 @@ typedef struct xen_acpi_wmi_cmd_info {
+ void xen_acpi_wmi_init(PCIDevice *device);
+ void xen_acpi_wmi_cleanup(void);
+ 
++#ifndef CONFIG_NO_XEN_ACPI_WMI
++
++void xen_acpi_wmi_set_guid(uint8_t val);
++void xen_acpi_wmi_set_cmd_instance(uint32_t val);
++void xen_acpi_wmi_set_method_id(uint32_t val);
++xen_wmi_buffer_t *xen_acpi_wmi_get_input_buffer(void);
++void xen_acpi_wmi_set_in_buffer_size(uint32_t val);
++void xen_acpi_wmi_set_in_buffer(uint8_t val);
++xen_wmi_buffer_t *xen_acpi_wmi_get_output_buffer(void);
++void xen_acpi_wmi_allocate_output_buffer(size_t length);
++int xen_acpi_wmi_reallocate_output_buffer(void);
++void xen_acpi_wmi_free_input_buffer(void);
++void xen_acpi_wmi_execute(void);
++void xen_acpi_wmi_set_event_id(uint8_t event_id);
++static uint32_t xen_acpi_wmi_cmd_port_read(void *opaque, uint32_t addr);
++static void xen_acpi_wmi_cmd_port_write(void *opaque, uint32_t addr, uint32_t val);
++static uint32_t xen_acpi_wmi_data_port_readb(void *opaque, uint32_t addr);
++static void xen_acpi_wmi_data_port_writeb(void *opaque, uint32_t addr, uint32_t val);
++static uint32_t xen_acpi_wmi_data_port_readl(void *opaque, uint32_t addr);
++static void xen_acpi_wmi_data_port_writel(void *opaque, uint32_t addr, uint32_t val);
++
++#endif
++
+ #endif /* _XEN_ACPI_WMI_H */
+ 
+ 
+diff --git a/hw/xen_platform.c b/hw/xen_platform.c
+index e77ee9f..351e4cc 100644
+--- a/hw/xen_platform.c
++++ b/hw/xen_platform.c
+@@ -29,7 +29,7 @@
+ #include "irq.h"
+ #include "qemu-xen.h"
+ #include "net.h"
+-
++#include "xen_platform.h"
+ #include <assert.h>
+ #include <xenguest.h>
+ 
+diff --git a/hw/xen_platform.h b/hw/xen_platform.h
+index 33af766..f7db3ce 100644
+--- a/hw/xen_platform.h
++++ b/hw/xen_platform.h
+@@ -6,4 +6,7 @@
+ void pci_xen_platform_init(PCIBus *bus);
+ void platform_fixed_ioport_init(void);
+ 
++void platform_fixed_ioport_save(QEMUFile *f, void *opaque);
++int platform_fixed_ioport_load(QEMUFile *f, void *opaque, int version_id);
++
+ #endif
+diff --git a/qemu-xen.h b/qemu-xen.h
+index 1410d4f..f694f0b 100644
+--- a/qemu-xen.h
++++ b/qemu-xen.h
+@@ -24,7 +24,6 @@ void timeoffset_get(void);
+ 
+ /* xen_platform.c */
+ #ifndef QEMU_TOOL
+-void pci_xen_platform_init(PCIBus *bus);
+ void xen_vga_populate_vram(uint64_t vram_addr, uint32_t size);
+ void xen_vga_vram_map(uint64_t vram_addr, uint32_t size);
+ void set_vram_mapping(void *opaque, unsigned long begin, unsigned long end);
+@@ -113,6 +112,7 @@ int *xenstore_get_domids(int *len);
+ int xenstore_vm_write(int domid, const char *key, const char *val);
+ char *xenstore_vm_read(int domid, const char *key, unsigned int *len);
+ char *xenstore_device_model_read(int domid, const char *key, unsigned int *len);
++int xenstore_extended_power_mgmt_read_int(const char *key, int default_value);
+ char *xenstore_read_battery_data(int battery_status);
+ int xenstore_refresh_battery_status(void);
+ int xenstore_refresh_thermal_info(void);
+diff --git a/xenstore.c b/xenstore.c
+index 690b78e..9e97e87 100644
+--- a/xenstore.c
++++ b/xenstore.c
+@@ -1379,7 +1379,7 @@ static char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *le
+     return value;
+ }
+ 
+-int xenstore_extended_power_mgmt_read_int(char *key, int default_value)
++int xenstore_extended_power_mgmt_read_int(const char *key, int default_value)
+ {
+     int value = default_value;
+     char *buffer;

diff --git a/xen-3.4/series b/xen-3.4/series
index cd4c22ee523e18e1257f467bebf1da6ce9d71ee8..fed181d5ac2144d05afe56edd0667bbad842c106 100644 (file)
--- a/xen-3.4/series
+++ b/xen-3.4/series
@@ -10,3 +10,4 @@ disable-aio
 oem-features
 sleep-btn-support
 thermal-management
+fix-build-warnings