From: Peter Maydell Date: Tue, 5 Nov 2019 20:17:11 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-next-pull-request... X-Git-Tag: qemu-xen-4.14.0~303 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=412fbef3d076c43e56451bacb28c4544858c66a3;p=qemu-xen.git Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-next-pull-request' into staging Fix the fw_cfg reboot-timeout=-1 special value, add a test for it. # gpg: Signature made Sun 03 Nov 2019 22:21:02 GMT # gpg: using RSA key 89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (Phil) " [marginal] # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 89C1 E78F 601E E86C 8674 95CB A2A3 FD6E DEAD C0DE * remotes/philmd-gitlab/tags/fw_cfg-next-pull-request: tests/fw_cfg: Test 'reboot-timeout=-1' special value fw_cfg: Allow reboot-timeout=-1 again Signed-off-by: Peter Maydell --- 412fbef3d076c43e56451bacb28c4544858c66a3