From: Konrad Rzeszutek Wilk Date: Mon, 29 Jun 2015 20:06:19 +0000 (-0400) Subject: xen/pt: Use XEN_PT_LOG properly to guard against compiler warnings. X-Git-Tag: qemu-xen-4.7.0-rc1~34 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=189cd5f1c0601d06f07b478bc978ad2de3b79d1b;p=qemu-xen.git xen/pt: Use XEN_PT_LOG properly to guard against compiler warnings. 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. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index f9d2a68940..b2799c5432 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1434,7 +1434,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); }