[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/33] Revert "s390x/ccw: create s390 phb conditional
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 17/33] Revert "s390x/ccw: create s390 phb conditionally" |
Date: |
Fri, 6 Oct 2017 11:59:40 +0200 |
From: Christian Borntraeger <address@hidden>
This reverts commit d32bd032d8fde41281aae34c16a4aa97e9acfeac.
Turns out that old QEMUs always created a pci host bridge
and for many CPU models the migration from old QEMUs to new
QEMUs will fail with
qemu-system-s390x: Unknown savevm section or instance 'PCIBUS' 0
qemu-system-s390x: load of migration failed: Invalid argument
As a quick fix we will revert the commit and always create the
pci host bridge.
Signed-off-by: Christian Borntraeger <address@hidden>
[fixed revert to keep the comment fixup, added a comment in the code]
Cc: Cornelia Huck <address@hidden>
Cc: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 1bcb7000ab..2c689d50bc 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -251,6 +251,7 @@ static void ccw_init(MachineState *machine)
{
int ret;
VirtualCssBus *css_bus;
+ DeviceState *dev;
s390_sclp_init();
s390_memory_init(machine->ram_size);
@@ -266,13 +267,14 @@ static void ccw_init(MachineState *machine)
machine->initrd_filename, "s390-ccw.img",
"s390-netboot.img", true);
- if (s390_has_feat(S390_FEAT_ZPCI)) {
- DeviceState *dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);
- object_property_add_child(qdev_get_machine(),
- TYPE_S390_PCI_HOST_BRIDGE,
- OBJECT(dev), NULL);
- qdev_init_nofail(dev);
- }
+ /*
+ * We cannot easily make the pci host bridge conditional as older QEMUs
+ * always created it. Doing so would break migration across QEMU versions.
+ */
+ dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);
+ object_property_add_child(qdev_get_machine(), TYPE_S390_PCI_HOST_BRIDGE,
+ OBJECT(dev), NULL);
+ qdev_init_nofail(dev);
/* register hypercalls */
virtio_ccw_register_hcalls();
--
2.13.6
- [Qemu-devel] [PULL 08/33] virtio-ccw: use ccw data stream, (continued)
- [Qemu-devel] [PULL 08/33] virtio-ccw: use ccw data stream, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 09/33] 390x/css: introduce maximum data address checking, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 11/33] s390x/tcg: fix checking for invalid memory check, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 10/33] s390x/css: support ccw IDA, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 14/33] s390x/tcg: make stora(g) use the new _real mmu, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 13/33] s390x/tcg: make lura(g) use the new _real mmu., Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 15/33] s390x/tcg: make testblock use the new _real mmu, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 12/33] s390x/tcg: add MMU for real addresses, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 16/33] s390x/tcg: make idte/ipte use the new _real mmu, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 18/33] s390x/3270: IDA support for 3270 via CcwDataStream, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 17/33] Revert "s390x/ccw: create s390 phb conditionally",
Cornelia Huck <=
- [Qemu-devel] [PULL 20/33] MAINTAINERS: use KVM s390x maintainers for kvm-stubs.c and kvm_s390x.h, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 21/33] s390x: raise CPU hotplug irq after really hotplugged, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 19/33] s390x/3270: handle writes of arbitrary length, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 22/33] s390x/cpumodel: fix max STFL(E) bit number, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 23/33] target/s390x: get rid of next_core_id, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 24/33] s390x: introduce and use S390_MAX_CPUS, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 27/33] s390x/css: fix css migration compat handling, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 25/33] s390x/tcg: make STFL store into the lowcore, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 26/33] s390x: sort some devices into categories, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 28/33] s390/kvm: Support for get/set of extended TOD-Clock for guest, Cornelia Huck, 2017/10/06