No functional change intended.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
--- a/hw/pass-through.h
+++ b/hw/pass-through.h
@@ -414,8 +414,8 @@ int unregister_vga_regions(struct pt_dev
int setup_vga_pt(struct pt_dev *real_device);
PCIBus *intel_pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid,
uint16_t did, const char *name, uint16_t revision);
-void igd_pci_write(PCIDevice *pci_dev, int config_addr, uint32_t val, int len);
-uint32_t igd_pci_read(PCIDevice *pci_dev, int config_addr, int len);
+void igd_pci_write(PCIDevice *pci_dev, uint32_t config_addr, uint32_t val, int
len);
+uint32_t igd_pci_read(PCIDevice *pci_dev, uint32_t config_addr, int len);
#endif /* __PASSTHROUGH_H__ */
--- a/hw/pt-graphics.c
+++ b/hw/pt-graphics.c
@@ -36,7 +36,7 @@ void intel_pch_init(PCIBus *bus)
pch_map_irq, "intel_bridge_1f");
}
-void igd_pci_write(PCIDevice *pci_dev, int config_addr, uint32_t val, int len)
+void igd_pci_write(PCIDevice *pci_dev, uint32_t config_addr, uint32_t val, int
len)
{
assert(pci_dev->devfn == 0x00);
if ( !igd_passthru ) {
@@ -57,7 +57,7 @@ void igd_pci_write(PCIDevice *pci_dev, i
}
}
-uint32_t igd_pci_read(PCIDevice *pci_dev, int config_addr, int len)
+uint32_t igd_pci_read(PCIDevice *pci_dev, uint32_t config_addr, int len)
{
uint32_t val;
--- a/hw/xen_console.c
+++ b/hw/xen_console.c
@@ -181,7 +181,8 @@ static void xencons_send(struct XenConso
static int con_init(struct XenDevice *xendev)
{
struct XenConsole *con = container_of(xendev, struct XenConsole, xendev);
- char *type, *dom, *output, label[32];
+ char *type, *dom, label[32];
+ const char *output;
/* setup */
dom = xs_get_domain_path(xenstore, con->xendev.dom);
--- a/vl.c
+++ b/vl.c
@@ -41,6 +41,7 @@
#include "audio/audio.h"
#include "migration.h"
#include "kvm.h"
+#include "dma.h"
#include "balloon.h"
#include "hw/pci.h"
--- a/xenstore.c
+++ b/xenstore.c
@@ -1573,10 +1573,9 @@ void xenstore_store_pv_console_info(int
const char *devname) {
char buf[32];
- if (i == 0) {
- snprintf(buf, sizeof(buf), "/console", i);
- store_dev_info(devname, domid, chr, buf);
- } else {
+ if (i == 0)
+ store_dev_info(devname, domid, chr, "/console");
+ else {
snprintf(buf, sizeof(buf), "/device/console/%d", i);
store_dev_info(devname, domid, chr, buf);
}
qemu-warnings.patch
Description: Text document
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home