* [Qemu-devel] [PATCH] pci-assign: Move "Invalid ROM" error message to pci-assign-load-rom.c
@ 2016-06-15 17:05 Lin Ma
0 siblings, 0 replies; 3+ messages in thread
From: Lin Ma @ 2016-06-15 17:05 UTC (permalink / raw)
To: qemu-devel, mst, pbonzini; +Cc: ehabkost, rth, tiejun.chen
In function pci_assign_dev_load_option_rom, For those pci devices don't
have 'rom' file under sysfs or if loading ROM from external file, The
function returns NULL, and won't set the passed 'size' variable.
In these 2 cases, qemu still reports "Invalid ROM" error message, Users
may be confused by it.
Signed-off-by: Lin Ma <lma@suse.com>
---
hw/i386/kvm/pci-assign.c | 4 ----
hw/i386/pci-assign-load-rom.c | 3 +++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index db2cbd2..07d14f9 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -1892,8 +1892,4 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev)
pci_assign_dev_load_option_rom(&dev->dev, OBJECT(dev), &size,
dev->host.domain, dev->host.bus,
dev->host.slot, dev->host.function);
-
- if (!size) {
- error_report("pci-assign: Invalid ROM.");
- }
}
diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c
index 4bbb08c..0d8e4b2 100644
--- a/hw/i386/pci-assign-load-rom.c
+++ b/hw/i386/pci-assign-load-rom.c
@@ -40,6 +40,9 @@ void *pci_assign_dev_load_option_rom(PCIDevice *dev, struct Object *owner,
domain, bus, slot, function);
if (stat(rom_file, &st)) {
+ if (errno != ENOENT) {
+ error_report("pci-assign: Invalid ROM.");
+ }
return NULL;
}
--
2.8.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [Qemu-devel] [PATCH] pci-assign: Move "Invalid ROM" error message to pci-assign-load-rom.c
@ 2016-06-15 16:52 Lin Ma
2016-06-16 14:55 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Lin Ma @ 2016-06-15 16:52 UTC (permalink / raw)
To: qemu-devel, mst, pbonzini; +Cc: ehabkost, rth, tiejun.chen
In function pci_assign_dev_load_option_rom, For those pci devices don't
have 'rom' file under sysfs or if loading ROM from external file, The
function returns NULL, and won't set the passed 'size' variable.
In these 2 cases, qemu still reports "Invalid ROM" error message, Users
may be confused by it.
Signed-off-by: Lin Ma <lma@suse.com>
---
hw/i386/kvm/pci-assign.c | 4 ----
hw/i386/pci-assign-load-rom.c | 3 +++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index db2cbd2..07d14f9 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -1892,8 +1892,4 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev)
pci_assign_dev_load_option_rom(&dev->dev, OBJECT(dev), &size,
dev->host.domain, dev->host.bus,
dev->host.slot, dev->host.function);
-
- if (!size) {
- error_report("pci-assign: Invalid ROM.");
- }
}
diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c
index 4bbb08c..0d8e4b2 100644
--- a/hw/i386/pci-assign-load-rom.c
+++ b/hw/i386/pci-assign-load-rom.c
@@ -40,6 +40,9 @@ void *pci_assign_dev_load_option_rom(PCIDevice *dev, struct Object *owner,
domain, bus, slot, function);
if (stat(rom_file, &st)) {
+ if (errno != ENOENT) {
+ error_report("pci-assign: Invalid ROM.");
+ }
return NULL;
}
--
2.8.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] pci-assign: Move "Invalid ROM" error message to pci-assign-load-rom.c
2016-06-15 16:52 Lin Ma
@ 2016-06-16 14:55 ` Paolo Bonzini
0 siblings, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2016-06-16 14:55 UTC (permalink / raw)
To: Lin Ma, qemu-devel, mst; +Cc: ehabkost, rth, tiejun.chen, qemu-stable
On 15/06/2016 18:52, Lin Ma wrote:
> In function pci_assign_dev_load_option_rom, For those pci devices don't
> have 'rom' file under sysfs or if loading ROM from external file, The
> function returns NULL, and won't set the passed 'size' variable.
>
> In these 2 cases, qemu still reports "Invalid ROM" error message, Users
> may be confused by it.
>
> Signed-off-by: Lin Ma <lma@suse.com>
> ---
> hw/i386/kvm/pci-assign.c | 4 ----
> hw/i386/pci-assign-load-rom.c | 3 +++
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
> index db2cbd2..07d14f9 100644
> --- a/hw/i386/kvm/pci-assign.c
> +++ b/hw/i386/kvm/pci-assign.c
> @@ -1892,8 +1892,4 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev)
> pci_assign_dev_load_option_rom(&dev->dev, OBJECT(dev), &size,
> dev->host.domain, dev->host.bus,
> dev->host.slot, dev->host.function);
> -
> - if (!size) {
> - error_report("pci-assign: Invalid ROM.");
> - }
> }
> diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c
> index 4bbb08c..0d8e4b2 100644
> --- a/hw/i386/pci-assign-load-rom.c
> +++ b/hw/i386/pci-assign-load-rom.c
> @@ -40,6 +40,9 @@ void *pci_assign_dev_load_option_rom(PCIDevice *dev, struct Object *owner,
> domain, bus, slot, function);
>
> if (stat(rom_file, &st)) {
> + if (errno != ENOENT) {
> + error_report("pci-assign: Invalid ROM.");
> + }
> return NULL;
> }
>
>
Cc: qemu-stable@nongnu.org
It missed today's pull request, but it's queued.
Thanks,
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-16 14:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-15 17:05 [Qemu-devel] [PATCH] pci-assign: Move "Invalid ROM" error message to pci-assign-load-rom.c Lin Ma
-- strict thread matches above, loose matches on Subject: below --
2016-06-15 16:52 Lin Ma
2016-06-16 14:55 ` Paolo Bonzini
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).