[Qemu-devel] [PULL 0/2] Trivial patches for June 9 to June 15 2011

[Qemu-devel] [PULL 0/2] Trivial patches for June 9 to June 15 2011

[Stefan Hajnoczi]

The following changes since commit 71f34ad05359d7fa97996562d904979281ddc7f5:

  Merge remote-tracking branch 'alon/pull-libcacard-1' into staging (2011-06-15 09:03:49 -0500)

are available in the git repository at:

  ssh://repo.or.cz/srv/git/qemu/stefanha.git trivial-patches

Alexandre Raymond (1):
      Fix typo in cpus.c

Christophe Fergeau (1):
      lsi: Fix unused-but-set-variable warning

 cpus.c          |    2 +-
 hw/lsi53c895a.c |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

-- 
1.7.5.3

[Qemu-devel] [PATCH 1/2] lsi: Fix unused-but-set-variable warning

[Stefan Hajnoczi]

From: Christophe Fergeau <cfergeau@redhat.com>

This warning is new in gcc 4.6.

Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/lsi53c895a.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 83084b6..90c6cbc 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -889,7 +889,6 @@ static void lsi_do_msgout(LSIState *s)
     uint8_t msg;
     int len;
     uint32_t current_tag;
-    SCSIDevice *current_dev;
     lsi_request *current_req, *p, *p_next;
     int id;
 
@@ -901,7 +900,6 @@ static void lsi_do_msgout(LSIState *s)
         current_req = lsi_find_by_tag(s, current_tag);
     }
     id = (current_tag >> 8) & 0xf;
-    current_dev = s->bus.devs[id];
 
     DPRINTF("MSG out len=%d\n", s->dbc);
     while (s->dbc) {
-- 
1.7.5.3

[Qemu-devel] [PATCH 2/2] Fix typo in cpus.c

[Stefan Hajnoczi]

From: Alexandre Raymond <cerbere@gmail.com>

filed -> failed

Signed-off-by: Alexandre Raymond <cerbere@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 cpus.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cpus.c b/cpus.c
index 1fc34b7..4ab76f0 100644
--- a/cpus.c
+++ b/cpus.c
@@ -297,7 +297,7 @@ static void qemu_event_increment(void)
 
     /* EAGAIN is fine, a read must be pending.  */
     if (ret < 0 && errno != EAGAIN) {
-        fprintf(stderr, "qemu_event_increment: write() filed: %s\n",
+        fprintf(stderr, "qemu_event_increment: write() failed: %s\n",
                 strerror(errno));
         exit (1);
     }
-- 
1.7.5.3

Re: [Qemu-devel] [PULL 0/2] Trivial patches for June 9 to June 15 2011

[Stefan Hajnoczi]

On Wed, Jun 15, 2011 at 5:47 PM, Stefan Hajnoczi
<stefanha@linux.vnet.ibm.com> wrote:
> The following changes since commit 71f34ad05359d7fa97996562d904979281ddc7f5:
>
>  Merge remote-tracking branch 'alon/pull-libcacard-1' into staging (2011-06-15 09:03:49 -0500)
>
> are available in the git repository at:
>
>  ssh://repo.or.cz/srv/git/qemu/stefanha.git trivial-patches
>
> Alexandre Raymond (1):
>      Fix typo in cpus.c
>
> Christophe Fergeau (1):
>      lsi: Fix unused-but-set-variable warning
>
>  cpus.c          |    2 +-
>  hw/lsi53c895a.c |    2 --
>  2 files changed, 1 insertions(+), 3 deletions(-)

Ping?

Stefan

Re: [Qemu-devel] [PULL 0/2] Trivial patches for June 9 to June 15 2011

[Anthony Liguori]

On 06/15/2011 11:47 AM, Stefan Hajnoczi wrote:
> The following changes since commit 71f34ad05359d7fa97996562d904979281ddc7f5:
>
>    Merge remote-tracking branch 'alon/pull-libcacard-1' into staging (2011-06-15 09:03:49 -0500)
>
> are available in the git repository at:
>
>    ssh://repo.or.cz/srv/git/qemu/stefanha.git trivial-patches

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Alexandre Raymond (1):
>        Fix typo in cpus.c
>
> Christophe Fergeau (1):
>        lsi: Fix unused-but-set-variable warning
>
>   cpus.c          |    2 +-
>   hw/lsi53c895a.c |    2 --
>   2 files changed, 1 insertions(+), 3 deletions(-)
>