431f30630a
Synch with IBS qemu: includes xen patches, security patches, some spec file cleanup, and finally getting qemu-bridge-helper working right. Also temporarily disable librbd dependency in OBS until staging impact concerns get resolved. OBS-URL: https://build.opensuse.org/request/show/416912 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=309
53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
From f4fe76597dccb9017be71983c4204f21877fc69f Mon Sep 17 00:00:00 2001
|
|
From: Lin Ma <lma@suse.com>
|
|
Date: Thu, 16 Jun 2016 01:05:27 +0800
|
|
Subject: [PATCH] pci-assign: Move "Invalid ROM" error message to
|
|
pci-assign-load-rom.c
|
|
|
|
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>
|
|
Message-Id: <1466010327-22368-1-git-send-email-lma@suse.com>
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit be968c721ee9df49708691ab58f0e66b394dea82)
|
|
[BR: BSC#982927]
|
|
Signed-off-by: Bruce Rogers <brogers@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 bf425a2..8abce52 100644
|
|
--- a/hw/i386/kvm/pci-assign.c
|
|
+++ b/hw/i386/kvm/pci-assign.c
|
|
@@ -1891,8 +1891,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;
|
|
}
|
|
|