All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jan Beulich" <JBeulich@novell.com>
To: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>
Subject: [PATCH] qemu: eliminate compiler warnings
Date: Fri, 22 Oct 2010 14:47:23 +0100	[thread overview]
Message-ID: <4CC1B20B020000780001E9A7@vpn.id2.novell.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 2512 bytes --]

No functional change intended.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

--- 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);
     }




[-- Attachment #2: qemu-warnings.patch --]
[-- Type: text/plain, Size: 2506 bytes --]

No functional change intended.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

--- 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);
     }

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

             reply	other threads:[~2010-10-22 13:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-22 13:47 Jan Beulich [this message]
2010-10-28 11:28 ` [PATCH] qemu: eliminate compiler warnings Ian Jackson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4CC1B20B020000780001E9A7@vpn.id2.novell.com \
    --to=jbeulich@novell.com \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.