[lxc-devel] [lxd/master] lxd/vm: Don't specify addresses for pci on ppc64

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200130/55e8df7f/attachment.bin>
-------------- next part --------------
From dff8bbd33d5ca13eadb057df3e08ad9286749b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 30 Jan 2020 12:43:42 -0500
Subject: [PATCH] lxd/vm: Don't specify addresses for pci on ppc64
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/instance/drivers/driver_qemu_templates.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lxd/instance/drivers/driver_qemu_templates.go b/lxd/instance/drivers/driver_qemu_templates.go
index a70130f8aa..6567a474b0 100644
--- a/lxd/instance/drivers/driver_qemu_templates.go
+++ b/lxd/instance/drivers/driver_qemu_templates.go
@@ -65,7 +65,6 @@ addr = "0x2"
 driver = "virtio-scsi-pci"
 {{if eq .architecture "ppc64le" -}}
 bus = "pci.0"
-addr = "0x2"
 {{else -}}
 bus = "qemu_pcie1"
 addr = "0x0"
@@ -85,7 +84,6 @@ addr = "0x2.0x1"
 driver = "virtio-balloon-pci"
 {{if eq .architecture "ppc64le" -}}
 bus = "pci.0"
-addr = "0x2.0x1"
 {{else -}}
 bus = "qemu_pcie2"
 addr = "0x0"
@@ -110,7 +108,6 @@ driver = "virtio-rng-pci"
 rng = "qemu_rng"
 {{if eq .architecture "ppc64le" -}}
 bus = "pci.0"
-addr = "0x2.0x2"
 {{else -}}
 bus = "qemu_pcie3"
 addr = "0x0"
@@ -143,7 +140,6 @@ driver = "vhost-vsock-pci"
 guest-cid = "{{.vsockID}}"
 {{if eq .architecture "ppc64le" -}}
 bus = "pci.0"
-addr = "0x2.0x3"
 {{else -}}
 bus = "qemu_pcie4"
 addr = "0x0"
@@ -238,7 +234,6 @@ netdev = "lxd_{{.devName}}"
 mac = "{{.devHwaddr}}"
 {{if eq .architecture "ppc64le" -}}
 bus = "pci.0"
-addr = "0x2.0x{{.pcieAddr}}"
 {{else -}}
 bus = "qemu_pcie{{.chassisIndex}}"
 addr = "0x0"