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

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

[Gerd Hoffmann]

  Hi,

$subject says all.

cheers,
  Gerd

Gerd Hoffmann (2):
  avoid asprintf (not available on mingw)
  scsi: fix warning

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

[Qemu-devel] [PATCH 1/2] avoid asprintf (not available on mingw64)

[Gerd Hoffmann]

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

diff --git a/hw/msix.c b/hw/msix.c
index 800fc32..04345f2 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -307,9 +307,8 @@ int msix_init_exclusive_bar(PCIDevice *dev, unsigned short nentries,
         return -EINVAL;
     }
 
-    if (asprintf(&name, "%s-msix", dev->name) == -1) {
-        return -ENOMEM;
-    }
+    name = g_malloc(sizeof(dev->name) + 5);
+    snprintf(name, sizeof(dev->name) + 5, "%s-msix", dev->name);
 
     memory_region_init(&dev->msix_exclusive_bar, name, MSIX_EXCLUSIVE_BAR_SIZE);
 
-- 
1.7.1

[Qemu-devel] [PATCH 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 2/2] scsi: fix warning

[Paolo Bonzini]

Il 10/08/2012 15:26, Gerd Hoffmann ha scritto:
> 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:
> 

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Paolo

Re: [Qemu-devel] [PATCH 1/2] avoid asprintf (not available on mingw64)

[Markus Armbruster]

Gerd Hoffmann <kraxel@redhat.com> writes:

> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/msix.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/hw/msix.c b/hw/msix.c
> index 800fc32..04345f2 100644
> --- a/hw/msix.c
> +++ b/hw/msix.c
> @@ -307,9 +307,8 @@ int msix_init_exclusive_bar(PCIDevice *dev, unsigned short nentries,
>          return -EINVAL;
>      }
>  
> -    if (asprintf(&name, "%s-msix", dev->name) == -1) {
> -        return -ENOMEM;
> -    }
> +    name = g_malloc(sizeof(dev->name) + 5);
> +    snprintf(name, sizeof(dev->name) + 5, "%s-msix", dev->name);
>  
>      memory_region_init(&dev->msix_exclusive_bar, name, MSIX_EXCLUSIVE_BAR_SIZE);

What about g_strdup_printf()?

Re: [Qemu-devel] [PATCH 1/2] avoid asprintf (not available on mingw64)

[Blue Swirl]

On Fri, Aug 10, 2012 at 2:18 PM, Markus Armbruster <armbru@redhat.com> wrote:
> Gerd Hoffmann <kraxel@redhat.com> writes:
>
>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>> ---
>>  hw/msix.c |    5 ++---
>>  1 files changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/hw/msix.c b/hw/msix.c
>> index 800fc32..04345f2 100644
>> --- a/hw/msix.c
>> +++ b/hw/msix.c
>> @@ -307,9 +307,8 @@ int msix_init_exclusive_bar(PCIDevice *dev, unsigned short nentries,
>>          return -EINVAL;
>>      }
>>
>> -    if (asprintf(&name, "%s-msix", dev->name) == -1) {
>> -        return -ENOMEM;
>> -    }
>> +    name = g_malloc(sizeof(dev->name) + 5);
>> +    snprintf(name, sizeof(dev->name) + 5, "%s-msix", dev->name);
>>
>>      memory_region_init(&dev->msix_exclusive_bar, name, MSIX_EXCLUSIVE_BAR_SIZE);
>
> What about g_strdup_printf()?

+1

In either case, free() below needs to be changed to g_free().

Re: [Qemu-devel] [PATCH 1/2] avoid asprintf (not available on mingw64)

[Gerd Hoffmann]

On 08/10/12 16:18, Markus Armbruster wrote:
>> -    if (asprintf(&name, "%s-msix", dev->name) == -1) {
> 
> What about g_strdup_printf()?

Ah, nice.  Didn't know glib has this.

cheers,
  Gerd