| Message ID | 1435865479-18329-7-git-send-email-konrad.wilk@oracle.com |
|---|---|
| State | New |
| Headers | show |
On Thu, 2 Jul 2015, Konrad Rzeszutek Wilk wrote: > If XEN_PT_LOGGING_ENABLED is enabled the XEN_PT_LOG macros start > using the first argument. Which means if within the function there > is only one user of the argument ('d') and XEN_PT_LOGGING_ENABLED > is not set, we get compiler warnings. This is not the case now > but with the "xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config" > we will hit - so this sync up the function to the rest of them. > > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > hw/xen/xen_pt_config_init.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c > index 462e1b9..21d4938 100644 > --- a/hw/xen/xen_pt_config_init.c > +++ b/hw/xen/xen_pt_config_init.c > @@ -1418,7 +1418,7 @@ static int xen_pt_msixctrl_reg_init(XenPCIPassthroughState *s, > reg_field = pci_get_word(d->config + real_offset); > > if (reg_field & PCI_MSIX_FLAGS_ENABLE) { > - XEN_PT_LOG(d, "MSIX already enabled, disabling it first\n"); > + XEN_PT_LOG(&s->dev, "MSIX already enabled, disabling it first\n"); > xen_host_pci_set_word(&s->real_device, real_offset, > reg_field & ~PCI_MSIX_FLAGS_ENABLE); > } > -- > 2.1.0 >
diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 462e1b9..21d4938 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1418,7 +1418,7 @@ static int xen_pt_msixctrl_reg_init(XenPCIPassthroughState *s, reg_field = pci_get_word(d->config + real_offset); if (reg_field & PCI_MSIX_FLAGS_ENABLE) { - XEN_PT_LOG(d, "MSIX already enabled, disabling it first\n"); + XEN_PT_LOG(&s->dev, "MSIX already enabled, disabling it first\n"); xen_host_pci_set_word(&s->real_device, real_offset, reg_field & ~PCI_MSIX_FLAGS_ENABLE); }
If XEN_PT_LOGGING_ENABLED is enabled the XEN_PT_LOG macros start using the first argument. Which means if within the function there is only one user of the argument ('d') and XEN_PT_LOGGING_ENABLED is not set, we get compiler warnings. This is not the case now but with the "xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config" we will hit - so this sync up the function to the rest of them. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- hw/xen/xen_pt_config_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)