[v2] testing and misc updates

[PATCH v2 07/10] hw/i386: make explicit clearing of pch_rev_id

Posted by Alex Bennée 5 years, 5 months ago

Some compilers (notably the Xenial gcc in Travis) fail to spot that
this will always be set if pch_dev_id != 0xffff. Given this is setup
code and using _Pragma to override is equally as ugly lets just remove
the doubt from the compilers mind.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 hw/i386/pc_piix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 32b1453e6a8..33fa035fb7f 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -930,7 +930,7 @@ void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id)
     struct PCIDevice *bridge_dev;
     int i, num;
     uint16_t pch_dev_id = 0xffff;
-    uint8_t pch_rev_id;
+    uint8_t pch_rev_id = 0;
 
     num = ARRAY_SIZE(igd_combo_id_infos);
     for (i = 0; i < num; i++) {
-- 
2.20.1

Re: [PATCH v2 07/10] hw/i386: make explicit clearing of pch_rev_id

Posted by Philippe Mathieu-Daudé 5 years, 5 months ago

On 9/9/20 1:27 PM, Alex Bennée wrote:
> Some compilers (notably the Xenial gcc in Travis) fail to spot that
> this will always be set if pch_dev_id != 0xffff. Given this is setup
> code and using _Pragma to override is equally as ugly lets just remove
> the doubt from the compilers mind.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  hw/i386/pc_piix.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 32b1453e6a8..33fa035fb7f 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -930,7 +930,7 @@ void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id)
>      struct PCIDevice *bridge_dev;
>      int i, num;
>      uint16_t pch_dev_id = 0xffff;
> -    uint8_t pch_rev_id;
> +    uint8_t pch_rev_id = 0;
>  
>      num = ARRAY_SIZE(igd_combo_id_infos);
>      for (i = 0; i < num; i++) {
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>