* [Qemu-devel] [PATCH] pci-assign: Fix error_report of pci-stub message
@ 2013-10-10 16:58 Cole Robinson
2013-10-10 17:03 ` Alex Williamson
2013-10-11 6:19 ` Markus Armbruster
0 siblings, 2 replies; 4+ messages in thread
From: Cole Robinson @ 2013-10-10 16:58 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.williamson, Cole Robinson, mst
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_report to preserve the intended
formatting.
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
hw/i386/kvm/pci-assign.c | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index 5618173..787b86e 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -792,25 +792,21 @@ static void assign_failed_examine(AssignedDevice *dev)
}
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("***");
+ "%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;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] pci-assign: Fix error_report of pci-stub message
2013-10-10 16:58 [Qemu-devel] [PATCH] pci-assign: Fix error_report of pci-stub message Cole Robinson
@ 2013-10-10 17:03 ` Alex Williamson
2013-10-11 6:19 ` Markus Armbruster
1 sibling, 0 replies; 4+ messages in thread
From: Alex Williamson @ 2013-10-10 17:03 UTC (permalink / raw)
To: Cole Robinson; +Cc: qemu-devel, mst
On Thu, 2013-10-10 at 12:58 -0400, 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_report to preserve the intended
> formatting.
>
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
> hw/i386/kvm/pci-assign.c | 34 +++++++++++++++-------------------
> 1 file changed, 15 insertions(+), 19 deletions(-)
Acked-by: Alex Williamson <alex.williamson@redhat.com>
> diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
> index 5618173..787b86e 100644
> --- a/hw/i386/kvm/pci-assign.c
> +++ b/hw/i386/kvm/pci-assign.c
> @@ -792,25 +792,21 @@ static void assign_failed_examine(AssignedDevice *dev)
> }
>
> 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("***");
> + "%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;
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] pci-assign: Fix error_report of pci-stub message
2013-10-10 16:58 [Qemu-devel] [PATCH] pci-assign: Fix error_report of pci-stub message Cole Robinson
2013-10-10 17:03 ` Alex Williamson
@ 2013-10-11 6:19 ` Markus Armbruster
2013-10-11 15:49 ` Cole Robinson
1 sibling, 1 reply; 4+ messages in thread
From: Markus Armbruster @ 2013-10-11 6:19 UTC (permalink / raw)
To: Cole Robinson; +Cc: alex.williamson, qemu-devel, mst
Cole Robinson <crobinso@redhat.com> writes:
> 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_report to preserve the intended
> formatting.
The orthodox way to do this is to use error_report() for the
(single-line!) error message, then error_printf() for additional
information. See commit 2da2e52..312fd5f for an example.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] pci-assign: Fix error_report of pci-stub message
2013-10-11 6:19 ` Markus Armbruster
@ 2013-10-11 15:49 ` Cole Robinson
0 siblings, 0 replies; 4+ messages in thread
From: Cole Robinson @ 2013-10-11 15:49 UTC (permalink / raw)
To: Markus Armbruster; +Cc: alex.williamson, qemu-devel, mst
On 10/11/2013 02:19 AM, Markus Armbruster wrote:
> Cole Robinson <crobinso@redhat.com> writes:
>
>> 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_report to preserve the intended
>> formatting.
>
> The orthodox way to do this is to use error_report() for the
> (single-line!) error message, then error_printf() for additional
> information. See commit 2da2e52..312fd5f for an example.
>
Sounds good. This code path is always preceded by an error_report() call, we
can just change this massive message to error_printf().
- Cole
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-10-11 15:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-10 16:58 [Qemu-devel] [PATCH] pci-assign: Fix error_report of pci-stub message Cole Robinson
2013-10-10 17:03 ` Alex Williamson
2013-10-11 6:19 ` Markus Armbruster
2013-10-11 15:49 ` Cole Robinson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).