[Qemu-devel] [PATCH v2 0/2] two little build fixes

[Qemu-devel] [PATCH v2 0/2] two little build fixes

[Gerd Hoffmann]

  Hi,

Patch #1 uses g_strdup_printf now, #2 is unchanged.

cheers,
  Gerd

Gerd Hoffmann (2):
  Avoid asprintf() which is not available on mingw
  scsi: fix warning

 hw/msix.c     |    8 ++------
 hw/scsi-bus.c |    2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

[Qemu-devel] [PATCH v2 1/2] Avoid asprintf() which is not available on mingw

[Gerd Hoffmann]

Use g_strdup_printf() instead.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/msix.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/hw/msix.c b/hw/msix.c
index 800fc32..aea340b 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -307,13 +307,9 @@ int msix_init_exclusive_bar(PCIDevice *dev, unsigned short nentries,
         return -EINVAL;
     }
 
-    if (asprintf(&name, "%s-msix", dev->name) == -1) {
-        return -ENOMEM;
-    }
-
+    name = g_strdup_printf("%s-msix", dev->name);
     memory_region_init(&dev->msix_exclusive_bar, name, MSIX_EXCLUSIVE_BAR_SIZE);
-
-    free(name);
+    g_free(name);
 
     ret = msix_init(dev, nentries, &dev->msix_exclusive_bar, bar_nr,
                     MSIX_EXCLUSIVE_BAR_TABLE_OFFSET, &dev->msix_exclusive_bar,
-- 
1.7.1

[Qemu-devel] [PATCH v2 2/2] scsi: fix warning

[Gerd Hoffmann]

hw/scsi-bus.c:758: warning: ‘xfer’ may be used uninitialized in this
function

Isn't true, but older gcc versions (for example 4.1 as shipped in rhel5)
are not clever enougth to figure, so sprinkle in a default: line to make
them happy.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/scsi-bus.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index b8a857d..4981a02 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -761,6 +761,7 @@ static int ata_passthrough_12_xfer_size(SCSIDevice *dev, uint8_t *buf)
     switch (length) {
     case 0:
     case 3: /* USB-specific.  */
+    default:
         xfer = 0;
         break;
     case 1:
@@ -784,6 +785,7 @@ static int ata_passthrough_16_xfer_size(SCSIDevice *dev, uint8_t *buf)
     switch (length) {
     case 0:
     case 3: /* USB-specific.  */
+    default:
         xfer = 0;
         break;
     case 1:
-- 
1.7.1

Re: [Qemu-devel] [PATCH v2 1/2] Avoid asprintf() which is not available on mingw

[Stefan Weil]

Am 13.08.2012 13:05, schrieb Gerd Hoffmann:
> Use g_strdup_printf() instead.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>   hw/msix.c |    8 ++------
>   1 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/hw/msix.c b/hw/msix.c
> index 800fc32..aea340b 100644
> --- a/hw/msix.c
> +++ b/hw/msix.c
> @@ -307,13 +307,9 @@ int msix_init_exclusive_bar(PCIDevice *dev, unsigned short nentries,
>           return -EINVAL;
>       }
>   
> -    if (asprintf(&name, "%s-msix", dev->name) == -1) {
> -        return -ENOMEM;
> -    }
> -
> +    name = g_strdup_printf("%s-msix", dev->name);
>       memory_region_init(&dev->msix_exclusive_bar, name, MSIX_EXCLUSIVE_BAR_SIZE);
> -
> -    free(name);
> +    g_free(name);
>   
>       ret = msix_init(dev, nentries, &dev->msix_exclusive_bar, bar_nr,
>                       MSIX_EXCLUSIVE_BAR_TABLE_OFFSET, &dev->msix_exclusive_bar,

Reviewed-by: Stefan Weil <sw@weilnetz.de>

Re: [Qemu-devel] [PATCH v2 0/2] two little build fixes

[Blue Swirl]

On Mon, Aug 13, 2012 at 11:05 AM, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Patch #1 uses g_strdup_printf now, #2 is unchanged.

Thanks, applied both.

>
> cheers,
>   Gerd
>
> Gerd Hoffmann (2):
>   Avoid asprintf() which is not available on mingw
>   scsi: fix warning
>
>  hw/msix.c     |    8 ++------
>  hw/scsi-bus.c |    2 ++
>  2 files changed, 4 insertions(+), 6 deletions(-)
>
>