Re: [Qemu-trivial] [PATCH v2] pci-assign: Fix error_report of pci-stub message

[Cole Robinson <crobinso@redhat.com>]

cc-ing qemu-trivial since this hasn't been picked up yet AFAICT.

- Cole

On 10/11/2013 11:52 AM, Cole Robinson wrote:
> Using multiple calls to error_report here means every line is
> prefaced with the (potentially long) pci-assign command line
> arguments.
> 
> Use a single error_printf to preserve the intended formatting.
> Since this code path is always preceded by an error_report call,
> we don't lose the command line reporting.
> 
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
> 
> v2: Switch to error_printf
> 
>  hw/i386/kvm/pci-assign.c | 36 ++++++++++++++++--------------------
>  1 file changed, 16 insertions(+), 20 deletions(-)
> 
> diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
> index 5618173..f013a1c 100644
> --- a/hw/i386/kvm/pci-assign.c
> +++ b/hw/i386/kvm/pci-assign.c
> @@ -791,26 +791,22 @@ static void assign_failed_examine(AssignedDevice *dev)
>          goto fail;
>      }
>  
> -    error_report("*** The driver '%s' is occupying your device "
> -                 "%04x:%02x:%02x.%x.",
> -                 ns, dev->host.domain, dev->host.bus, dev->host.slot,
> -                 dev->host.function);
> -    error_report("***");
> -    error_report("*** You can try the following commands to free it:");
> -    error_report("***");
> -    error_report("*** $ echo \"%04x %04x\" > /sys/bus/pci/drivers/pci-stub/"
> -                 "new_id", vendor_id, device_id);
> -    error_report("*** $ echo \"%04x:%02x:%02x.%x\" > /sys/bus/pci/drivers/"
> -                 "%s/unbind",
> -                 dev->host.domain, dev->host.bus, dev->host.slot,
> -                 dev->host.function, ns);
> -    error_report("*** $ echo \"%04x:%02x:%02x.%x\" > /sys/bus/pci/drivers/"
> -                 "pci-stub/bind",
> -                 dev->host.domain, dev->host.bus, dev->host.slot,
> -                 dev->host.function);
> -    error_report("*** $ echo \"%04x %04x\" > /sys/bus/pci/drivers/pci-stub"
> -                 "/remove_id", vendor_id, device_id);
> -    error_report("***");
> +    error_printf("*** The driver '%s' is occupying your device "
> +        "%04x:%02x:%02x.%x.\n"
> +        "***\n"
> +        "*** You can try the following commands to free it:\n"
> +        "***\n"
> +        "*** $ echo \"%04x %04x\" > /sys/bus/pci/drivers/pci-stub/new_id\n"
> +        "*** $ echo \"%04x:%02x:%02x.%x\" > /sys/bus/pci/drivers/%s/unbind\n"
> +        "*** $ echo \"%04x:%02x:%02x.%x\" > /sys/bus/pci/drivers/"
> +        "pci-stub/bind\n"
> +        "*** $ echo \"%04x %04x\" > /sys/bus/pci/drivers/pci-stub/remove_id\n"
> +        "***",
> +        ns, dev->host.domain, dev->host.bus, dev->host.slot,
> +        dev->host.function, vendor_id, device_id,
> +        dev->host.domain, dev->host.bus, dev->host.slot, dev->host.function,
> +        ns, dev->host.domain, dev->host.bus, dev->host.slot,
> +        dev->host.function, vendor_id, device_id);
>  
>      return;
>  
>