- fix a memory leak in the ipl code introduced with this release

- increase timeout in the bios to avoid hangs during migration (and
   rebuild bios to activate the change)
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEw9DWbcNiT/aowBjO3s9rk8bwL68FAlrDOy4SHGNvaHVja0By
 ZWRoYXQuY29tAAoJEN7Pa5PG8C+vi5YP/3AlyYCxb51CF/1k1ao7VHVvJhQBs4Ez
 KURroqhpZXSyEVsqSixjnOFu8C56+Uzz4Qg3LdY32gClSjD0oyZHea00qf599GVk
 tIzQI2nSnuMtvOdAQVMUU+TZ4Arp5c9Pg+PA/3nH+K2SvJIoWEl3GxmknEhzTHkM
 /ZPhO676DV9fMzbIrIYtPrDMGL6qJ/6Crt2FL6UeRDFCFMbq1N+0irQSysFmWTKV
 pLEFe6j8TsvCxdbMwIqiRzry8Y5FvE1Mu1o6uFTJMYVmFGQHX5g7O563W78a1xHM
 n1zAbyqdNqF4h12KOF0zkDKgCS1j4Fl46NS5dg4pRCHuZ4tJy29bwvBAFcGpzR0R
 5LcgnrLYk7pwGi3aEozNdHCCqbN0H5HibqZ4dlzV24DQaGtJTJCTxM/RKSiigknF
 IWgIBd1NND7tVOmXdjhdvvfssge2HMmALq+sfKR5p3aUQiECvAN0n14UeArVFuaJ
 K59DyRYEVNkyunfux9kLQt3MdhRbSqagABBFdHkPsMPv4DSd9JXhjowh4CZdd7ex
 Xq2m5zc0mHNHsH3r+2Rr0Jh8Kal8O4OeD6qYK41mHrSTYbmVSkF8qd1Kw3ZhqAi1
 2EsPvGpG9zrsKBElTLfoP/rDgg+KxC1K9793K8Dl/MlKmWmNqwQg006KaUZ93Gp1
 dFHDz3BmEsY+
 =B1VD
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180403' into staging

- fix a memory leak in the ipl code introduced with this release
- increase timeout in the bios to avoid hangs during migration (and
  rebuild bios to activate the change)

# gpg: Signature made Tue 03 Apr 2018 09:28:30 BST
# gpg:                using RSA key DECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20180403:
  pc-bios/s390-ccw: update image
  pc-bios/s390-ccw: Increase virtio timeout to 30 seconds
  hw/s390x: fix memory leak in s390_init_ipl_dev()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

hw/s390x/s390-virtio-ccw.c

@@ -246,6 +246,7 @@ static void s390_init_ipl_dev(const char *kernel_filename,
 {
     Object *new = object_new(TYPE_S390_IPL);
     DeviceState *dev = DEVICE(new);
+    char *netboot_fw_prop;
 
     if (kernel_filename) {
         qdev_prop_set_string(dev, "kernel", kernel_filename);
@@ -256,9 +257,11 @@ static void s390_init_ipl_dev(const char *kernel_filename,
     qdev_prop_set_string(dev, "cmdline", kernel_cmdline);
     qdev_prop_set_string(dev, "firmware", firmware);
     qdev_prop_set_bit(dev, "enforce_bios", enforce_bios);
-    if (!strlen(object_property_get_str(new, "netboot_fw", &error_abort))) {
+    netboot_fw_prop = object_property_get_str(new, "netboot_fw", &error_abort);
+    if (!strlen(netboot_fw_prop)) {
         qdev_prop_set_string(dev, "netboot_fw", netboot_fw);
     }
+    g_free(netboot_fw_prop);
     object_property_add_child(qdev_get_machine(), TYPE_S390_IPL,
                               new, NULL);
     object_unref(new);

pc-bios/s390-ccw/virtio.c

@@ -14,7 +14,7 @@
 #include "virtio-scsi.h"
 #include "bswap.h"
 
-#define VRING_WAIT_REPLY_TIMEOUT 3
+#define VRING_WAIT_REPLY_TIMEOUT 30
 
 static VRing block[VIRTIO_MAX_VQS];
 static char ring_area[VIRTIO_RING_SIZE * VIRTIO_MAX_VQS]