|
 |
982648 |
From 80eaa9617c886a6955d4752d90c82b807b572dca Mon Sep 17 00:00:00 2001
|
|
|
982648 |
Message-Id: <80eaa9617c886a6955d4752d90c82b807b572dca@dist-git>
|
|
|
982648 |
From: Erik Skultety <eskultet@redhat.com>
|
|
|
982648 |
Date: Tue, 31 Jul 2018 10:38:54 +0200
|
|
|
982648 |
Subject: [PATCH] qemu: Exempt video model 'none' from getting a PCI address on
|
|
|
982648 |
Q35
|
|
|
982648 |
MIME-Version: 1.0
|
|
|
982648 |
Content-Type: text/plain; charset=UTF-8
|
|
|
982648 |
Content-Transfer-Encoding: 8bit
|
|
|
982648 |
|
|
|
982648 |
Commit d48813e8 made sure we wouldn't get one for i440fx, but not for Q35
|
|
|
982648 |
machine type. If the primary video didn't get the assumed 0:0:1.0 PCI
|
|
|
982648 |
address, the evaluation then failed with: "Cannot automatically add a
|
|
|
982648 |
new PCI bus for a device with connect flags 00"
|
|
|
982648 |
|
|
|
982648 |
https: //bugzilla.redhat.com/show_bug.cgi?id=1609087
|
|
|
982648 |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
982648 |
(cherry picked from commit e9024b0cec3a66ac11784034bb62abe8ec7b46a1)
|
|
|
982648 |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
982648 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
982648 |
---
|
|
|
982648 |
src/qemu/qemu_domain_address.c | 5 +++--
|
|
|
982648 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
982648 |
|
|
|
982648 |
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
|
|
|
982648 |
index e6996934b8..0cb5af4a87 100644
|
|
|
982648 |
--- a/src/qemu/qemu_domain_address.c
|
|
|
982648 |
+++ b/src/qemu/qemu_domain_address.c
|
|
|
982648 |
@@ -1723,10 +1723,11 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
|
|
|
982648 |
goto cleanup;
|
|
|
982648 |
}
|
|
|
982648 |
|
|
|
982648 |
- if (def->nvideos > 0) {
|
|
|
982648 |
+ if (def->nvideos > 0 &&
|
|
|
982648 |
+ def->videos[0]->type != VIR_DOMAIN_VIDEO_TYPE_NONE) {
|
|
|
982648 |
/* NB: unlike the pc machinetypes, on q35 machinetypes the
|
|
|
982648 |
* integrated devices are at slot 0x1f, so when qemu looks for
|
|
|
982648 |
- * the first free lot for the first VGA, it will always be at
|
|
|
982648 |
+ * the first free slot for the first VGA, it will always be at
|
|
|
982648 |
* slot 1 (which was used up by the integrated PIIX3 devices
|
|
|
982648 |
* on pc machinetypes).
|
|
|
982648 |
*/
|
|
|
982648 |
--
|
|
|
982648 |
2.18.0
|
|
|
982648 |
|