Patchwork [01/20] eepro100: Fix compiler errors from debug messages

login
register
mail settings
Submitter Stefan Weil
Date Feb. 14, 2010, 4:16 p.m.
Message ID <1266164189-21062-1-git-send-email-weil@mail.berlios.de>
Download mbox | patch
Permalink /patch/45311/
State New
Headers show

Comments

Stefan Weil - Feb. 14, 2010, 4:16 p.m.
When debug output was enabled (by defining DEBUG_EEPRO100),
some debug messages resulted in a compiler error.

This is fixed here.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/eepro100.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
Anthony Liguori - Feb. 19, 2010, 9:05 p.m.
On 02/14/2010 10:16 AM, Stefan Weil wrote:
> When debug output was enabled (by defining DEBUG_EEPRO100),
> some debug messages resulted in a compiler error.
>
> This is fixed here.
>
> Signed-off-by: Stefan Weil<weil@mail.berlios.de>
>    

Michael,

Can you take these through your tree?

Regards,

Anthony Liguori

> ---
>   hw/eepro100.c |   13 +++++++------
>   1 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/hw/eepro100.c b/hw/eepro100.c
> index b33dbb8..6580ca8 100644
> --- a/hw/eepro100.c
> +++ b/hw/eepro100.c
> @@ -56,7 +56,9 @@
>   #define KiB 1024
>
>   /* Debug EEPRO100 card. */
> -//~ #define DEBUG_EEPRO100
> +#if 0
> +# define DEBUG_EEPRO100
> +#endif
>
>   #ifdef DEBUG_EEPRO100
>   #define logout(fmt, ...) fprintf(stderr, "EE100\t%-24s" fmt, __func__, ## __VA_ARGS__)
> @@ -874,9 +876,8 @@ static void action_command(EEPRO100State *s)
>           cpu_physical_memory_read(s->cb_address, (uint8_t *)&s->tx, sizeof(s->tx));
>           uint16_t status = le16_to_cpu(s->tx.status);
>           uint16_t command = le16_to_cpu(s->tx.command);
> -        logout
> -            ("val=0x%02x (cu start), status=0x%04x, command=0x%04x, link=0x%08x\n",
> -             val, status, command, s->tx.link);
> +        logout("val=(cu start), status=0x%04x, command=0x%04x, link=0x%08x\n",
> +               status, command, s->tx.link);
>           bool bit_el = ((command&  0x8000) != 0);
>           bool bit_s = ((command&  0x4000) != 0);
>           bool bit_i = ((command&  0x2000) != 0);
> @@ -891,7 +892,7 @@ static void action_command(EEPRO100State *s)
>               break;
>           case CmdIASetup:
>               cpu_physical_memory_read(s->cb_address + 8,&s->conf.macaddr.a[0], 6);
> -            TRACE(OTHER, logout("macaddr: %s\n", nic_dump(&s->macaddr[0], 6)));
> +            TRACE(OTHER, logout("macaddr: %s\n", nic_dump(&s->conf.macaddr.a[0], 6)));
>               break;
>           case CmdConfigure:
>               cpu_physical_memory_read(s->cb_address + 8,&s->configuration[0],
> @@ -1875,7 +1876,7 @@ static int nic_init(PCIDevice *pci_dev, uint32_t device)
>                              pci_mmio_map);
>
>       qemu_macaddr_default_if_unset(&s->conf.macaddr);
> -    logout("macaddr: %s\n", nic_dump(&s->macaddr[0], 6));
> +    logout("macaddr: %s\n", nic_dump(&s->conf.macaddr.a[0], 6));
>       assert(s->region[1] == 0);
>
>       nic_reset(s);
>
Stefan Weil - March 1, 2010, 5:54 p.m.
Anthony Liguori schrieb:
> On 02/14/2010 10:16 AM, Stefan Weil wrote:
>> When debug output was enabled (by defining DEBUG_EEPRO100),
>> some debug messages resulted in a compiler error.
>>
>> This is fixed here.
>>
>> Signed-off-by: Stefan Weil<weil@mail.berlios.de>
>>    
>
> Michael,
>
> Can you take these through your tree?
>
> Regards,
>
> Anthony Liguori

Up to now, I got feedback for 2 of these 20 patches:

[PATCH 05/20] eepro100: Add all supported devices to pci.c
    Michael asked whether it would be cleaner to have a single
    eepro100 device with specific model as qdev option.
    As long as there are no more opinions on this topic,
    I suggest to omit this single patch.

[PATCH 11/20] eepro100: Use symbolic names for bits in EEPROM id
    Michael had two points: an unused type name and enum members
    which were written in lower_case instead of UPPER_CASE.

If there are no other open topics, I suggest to commit the patch
series as it is (optionally without 05/20). Upper / lower case can be
fixed later when this new rule is added to the style guide.

Regards,

Stefan Weil

Patch

diff --git a/hw/eepro100.c b/hw/eepro100.c
index b33dbb8..6580ca8 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -56,7 +56,9 @@ 
 #define KiB 1024
 
 /* Debug EEPRO100 card. */
-//~ #define DEBUG_EEPRO100
+#if 0
+# define DEBUG_EEPRO100
+#endif
 
 #ifdef DEBUG_EEPRO100
 #define logout(fmt, ...) fprintf(stderr, "EE100\t%-24s" fmt, __func__, ## __VA_ARGS__)
@@ -874,9 +876,8 @@  static void action_command(EEPRO100State *s)
         cpu_physical_memory_read(s->cb_address, (uint8_t *)&s->tx, sizeof(s->tx));
         uint16_t status = le16_to_cpu(s->tx.status);
         uint16_t command = le16_to_cpu(s->tx.command);
-        logout
-            ("val=0x%02x (cu start), status=0x%04x, command=0x%04x, link=0x%08x\n",
-             val, status, command, s->tx.link);
+        logout("val=(cu start), status=0x%04x, command=0x%04x, link=0x%08x\n",
+               status, command, s->tx.link);
         bool bit_el = ((command & 0x8000) != 0);
         bool bit_s = ((command & 0x4000) != 0);
         bool bit_i = ((command & 0x2000) != 0);
@@ -891,7 +892,7 @@  static void action_command(EEPRO100State *s)
             break;
         case CmdIASetup:
             cpu_physical_memory_read(s->cb_address + 8, &s->conf.macaddr.a[0], 6);
-            TRACE(OTHER, logout("macaddr: %s\n", nic_dump(&s->macaddr[0], 6)));
+            TRACE(OTHER, logout("macaddr: %s\n", nic_dump(&s->conf.macaddr.a[0], 6)));
             break;
         case CmdConfigure:
             cpu_physical_memory_read(s->cb_address + 8, &s->configuration[0],
@@ -1875,7 +1876,7 @@  static int nic_init(PCIDevice *pci_dev, uint32_t device)
                            pci_mmio_map);
 
     qemu_macaddr_default_if_unset(&s->conf.macaddr);
-    logout("macaddr: %s\n", nic_dump(&s->macaddr[0], 6));
+    logout("macaddr: %s\n", nic_dump(&s->conf.macaddr.a[0], 6));
     assert(s->region[1] == 0);
 
     nic_reset(s);