[Qemu-devel] [PULL 0/8] Trivial patches for 8 to 19 March 2012

[Qemu-devel] [PULL 0/8] Trivial patches for 8 to 19 March 2012

[Stefan Hajnoczi]

The following changes since commit 5bd33de6635577744b3c10dd3913bfe8c5ffaf40:

  tcg: fix sparc host for AREG0 free operation (2012-03-18 19:15:32 +0000)

are available in the git repository at:

  git://github.com/stefanha/qemu.git trivial-patches

for you to fetch changes up to b71706d122838d9656e1a6dae80e22401babdf37:

  qemu-ga: for w32, fix leaked handle ov.hEvent in ga_channel_write() (2012-03-19 11:31:04 +0000)

----------------------------------------------------------------
Chen Yufei (1):
      Remove type field in ModuleEntry as it's not used

David Gibson (1):
      .gitignore: add qemu-bridge-helper and option rom build products

Jason Wang (1):
      ioapic: fix build with DEBUG_IOAPIC

Jeff Cody (2):
      monitor: Remove unused bool field 'qapi' in mon_cmd_t struct
      qemu-ga: for w32, fix leaked handle ov.hEvent in ga_channel_write()

Joshua Housh (1):
      cleanup obsolete typedef

Stefan Weil (2):
      vnc: Fix packed boolean struct members
      ds1338: Add missing break statement

 .gitignore          |    6 ++++++
 hw/ds1338.c         |    1 +
 hw/ioapic.c         |    2 +-
 module.c            |    1 -
 monitor.c           |    1 -
 qemu-common.h       |    1 -
 qga/channel-win32.c |    4 ++++
 ui/vnc-auth-sasl.c  |    4 +++-
 ui/vnc-auth-sasl.h  |    4 ++--
 9 files changed, 17 insertions(+), 7 deletions(-)

-- 
1.7.9.1

[Qemu-devel] [PATCH 1/8] Remove type field in ModuleEntry as it's not used

[Stefan Hajnoczi]

From: Chen Yufei <cyfdecyf@gmail.com>

Signed-off-by: Chen Yufei <cyfdecyf@gmail.com>
Acked-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 module.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/module.c b/module.c
index 106a969..c3a6da7 100644
--- a/module.c
+++ b/module.c
@@ -19,7 +19,6 @@
 
 typedef struct ModuleEntry
 {
-    module_init_type type;
     void (*init)(void);
     QTAILQ_ENTRY(ModuleEntry) node;
 } ModuleEntry;
-- 
1.7.9.1

[Qemu-devel] [PATCH 2/8] vnc: Fix packed boolean struct members

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

This patch fixes warnings reported by splint:

For variables which are packed in a single bit, a signed data type
like 'int' does not make much sense.

There is no obvious reason why the two values should be packed,
so I removed the packing and changed the data type to bool
because both are used as boolean values.

v2:

Some versions of gcc complain after this modification,
for example gcc (Debian 4.4.5-8) 4.4.5):

ui/vnc-auth-sasl.c: In function ‘vnc_sasl_client_cleanup’:
ui/vnc-auth-sasl.c:34: error: suggest parentheses around assignment used as truth value

Obviously, the compiler does not like code which does
bool = unsigned = bool = 0

Splitting that code in three statements works.

Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 ui/vnc-auth-sasl.c |    4 +++-
 ui/vnc-auth-sasl.h |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
index e2045fc..8fba770 100644
--- a/ui/vnc-auth-sasl.c
+++ b/ui/vnc-auth-sasl.c
@@ -31,7 +31,9 @@
 void vnc_sasl_client_cleanup(VncState *vs)
 {
     if (vs->sasl.conn) {
-        vs->sasl.runSSF = vs->sasl.waitWriteSSF = vs->sasl.wantSSF = 0;
+        vs->sasl.runSSF = false;
+        vs->sasl.wantSSF = false;
+        vs->sasl.waitWriteSSF = 0;
         vs->sasl.encodedLength = vs->sasl.encodedOffset = 0;
         vs->sasl.encoded = NULL;
         g_free(vs->sasl.username);
diff --git a/ui/vnc-auth-sasl.h b/ui/vnc-auth-sasl.h
index fd9b18a..ee243a9 100644
--- a/ui/vnc-auth-sasl.h
+++ b/ui/vnc-auth-sasl.h
@@ -37,9 +37,9 @@ typedef struct VncDisplaySASL VncDisplaySASL;
 struct VncStateSASL {
     sasl_conn_t *conn;
     /* If we want to negotiate an SSF layer with client */
-    int wantSSF :1;
+    bool wantSSF;
     /* If we are now running the SSF layer */
-    int runSSF :1;
+    bool runSSF;
     /*
      * If this is non-zero, then wait for that many bytes
      * to be written plain, before switching to SSF encoding
-- 
1.7.9.1

[Qemu-devel] [PATCH 3/8] ds1338: Add missing break statement

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

Without the break statement, case 5 sets month and year from the same
data. This does not look correct.

The missing break was reported by splint.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/ds1338.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/ds1338.c b/hw/ds1338.c
index 6397f0a..d590d9c 100644
--- a/hw/ds1338.c
+++ b/hw/ds1338.c
@@ -100,6 +100,7 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data)
             break;
         case 5:
             s->now.tm_mon = from_bcd(data & 0x1f) - 1;
+            break;
         case 6:
             s->now.tm_year = from_bcd(data) + 100;
             break;
-- 
1.7.9.1

[Qemu-devel] [PATCH 4/8] monitor: Remove unused bool field 'qapi' in mon_cmd_t struct

[Stefan Hajnoczi]

From: Jeff Cody <jcody@redhat.com>

Some minor code cleanup: the 'qapi' bool field in mon_cmd_t is
unused, and can be removed.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 monitor.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/monitor.c b/monitor.c
index d57e7bf..e71a141 100644
--- a/monitor.c
+++ b/monitor.c
@@ -128,7 +128,6 @@ typedef struct mon_cmd_t {
         int  (*cmd_async)(Monitor *mon, const QDict *params,
                           MonitorCompletion *cb, void *opaque);
     } mhandler;
-    bool qapi;
     int flags;
 } mon_cmd_t;
 
-- 
1.7.9.1

[Qemu-devel] [PATCH 5/8] cleanup obsolete typedef

[Stefan Hajnoczi]

From: Joshua Housh <joshua.housh@calxeda.com>

There are no users of i2c_slave.

Signed-off-by: Joshua Housh <joshua.housh@calxeda.com>
Signed-off-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 qemu-common.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/qemu-common.h b/qemu-common.h
index b0fdf5c..c9e96a8 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -236,7 +236,6 @@ typedef struct MACAddr MACAddr;
 typedef struct VLANState VLANState;
 typedef struct VLANClientState VLANClientState;
 typedef struct i2c_bus i2c_bus;
-typedef struct i2c_slave i2c_slave;
 typedef struct ISABus ISABus;
 typedef struct SMBusDevice SMBusDevice;
 typedef struct PCIHostState PCIHostState;
-- 
1.7.9.1

[Qemu-devel] [PATCH 6/8] .gitignore: add qemu-bridge-helper and option rom build products

[Stefan Hajnoczi]

From: David Gibson <david@gibson.dropbear.id.au>

This adds a few previously missing generated files to .gitignore: the
qemu-bridge-helper binary, and more generated versions of the
linuxboot, multiboot and kvmvapic roms from pc-bios/optionrom.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 .gitignore |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 81b1510..9859c7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ qemu-img-cmds.texi
 qemu-img-cmds.h
 qemu-io
 qemu-ga
+qemu-bridge-helper
 qemu-monitor.texi
 QMP/qmp-commands.txt
 test-coroutine
@@ -75,9 +76,14 @@ patches
 pc-bios/bios-pq/status
 pc-bios/vgabios-pq/status
 pc-bios/optionrom/linuxboot.bin
+pc-bios/optionrom/linuxboot.raw
+pc-bios/optionrom/linuxboot.img
 pc-bios/optionrom/multiboot.bin
 pc-bios/optionrom/multiboot.raw
+pc-bios/optionrom/multiboot.img
 pc-bios/optionrom/kvmvapic.bin
+pc-bios/optionrom/kvmvapic.raw
+pc-bios/optionrom/kvmvapic.img
 .stgit-*
 cscope.*
 tags
-- 
1.7.9.1

[Qemu-devel] [PATCH 7/8] ioapic: fix build with DEBUG_IOAPIC

[Stefan Hajnoczi]

From: Jason Wang <jasowang@redhat.com>

ioapic.c:198: error: format ‘%08x’ expects type ‘unsigned int’, but argument 3 has type ‘uint64_t’

Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/ioapic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/ioapic.c b/hw/ioapic.c
index 3fee011..e2e4796 100644
--- a/hw/ioapic.c
+++ b/hw/ioapic.c
@@ -195,7 +195,7 @@ ioapic_mem_write(void *opaque, target_phys_addr_t addr, uint64_t val,
         if (size != 4) {
             break;
         }
-        DPRINTF("write: %08x = %08x\n", s->ioregsel, val);
+        DPRINTF("write: %08x = %08" PRIx64 "\n", s->ioregsel, val);
         switch (s->ioregsel) {
         case IOAPIC_REG_ID:
             s->id = (val >> IOAPIC_ID_SHIFT) & IOAPIC_ID_MASK;
-- 
1.7.9.1

[Qemu-devel] [PATCH 8/8] qemu-ga: for w32, fix leaked handle ov.hEvent in ga_channel_write()

[Stefan Hajnoczi]

From: Jeff Cody <jcody@redhat.com>

In the function ga_channel_write(), the handle ov.hEvent is created
by the call to CreateEvent(). However, the handle is not closed
prior to the function return.

This patch closes the handle before the return of the function.

Kudos to Paolo Bonzini for spotting this bug.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Acked-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 qga/channel-win32.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/qga/channel-win32.c b/qga/channel-win32.c
index 190251b..16bf44a 100644
--- a/qga/channel-win32.c
+++ b/qga/channel-win32.c
@@ -259,6 +259,10 @@ static GIOStatus ga_channel_write(GAChannel *c, const char *buf, size_t size,
         *count = written;
     }
 
+    if (ov.hEvent) {
+        CloseHandle(ov.hEvent);
+        ov.hEvent = NULL;
+    }
     return status;
 }
 
-- 
1.7.9.1

Re: [Qemu-devel] [PULL 0/8] Trivial patches for 8 to 19 March 2012

[Anthony Liguori]

On 03/19/2012 07:22 AM, Stefan Hajnoczi wrote:
> The following changes since commit 5bd33de6635577744b3c10dd3913bfe8c5ffaf40:
>
>    tcg: fix sparc host for AREG0 free operation (2012-03-18 19:15:32 +0000)
>
> are available in the git repository at:
>
>    git://github.com/stefanha/qemu.git trivial-patches
>
> for you to fetch changes up to b71706d122838d9656e1a6dae80e22401babdf37:
>
>    qemu-ga: for w32, fix leaked handle ov.hEvent in ga_channel_write() (2012-03-19 11:31:04 +0000)

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> ----------------------------------------------------------------
> Chen Yufei (1):
>        Remove type field in ModuleEntry as it's not used
>
> David Gibson (1):
>        .gitignore: add qemu-bridge-helper and option rom build products
>
> Jason Wang (1):
>        ioapic: fix build with DEBUG_IOAPIC
>
> Jeff Cody (2):
>        monitor: Remove unused bool field 'qapi' in mon_cmd_t struct
>        qemu-ga: for w32, fix leaked handle ov.hEvent in ga_channel_write()
>
> Joshua Housh (1):
>        cleanup obsolete typedef
>
> Stefan Weil (2):
>        vnc: Fix packed boolean struct members
>        ds1338: Add missing break statement
>
>   .gitignore          |    6 ++++++
>   hw/ds1338.c         |    1 +
>   hw/ioapic.c         |    2 +-
>   module.c            |    1 -
>   monitor.c           |    1 -
>   qemu-common.h       |    1 -
>   qga/channel-win32.c |    4 ++++
>   ui/vnc-auth-sasl.c  |    4 +++-
>   ui/vnc-auth-sasl.h  |    4 ++--
>   9 files changed, 17 insertions(+), 7 deletions(-)
>