[01/12] Revert "qemu: Support chardevs with ARM virt machines"

Message ID 7bd360f9f9510cfa9ff3a04def6ef1f2d537c2b6.1498499391.git.crobinso@redhat.com
State Accepted
Commit e4574da0b79a1d07c89b873ed6f0275f035ae31f
Headers show
Series
  • qemu: support chardev for all machvirt config
Related show

Commit Message

Cole Robinson June 26, 2017, 6:01 p.m.
This reverts commit 70c9b44270f75bfb7a5701d81aa49380d139e8f0.

This commit breaks existing aarch64 machvirt configs with:

    <serial type='pty'>
      <target port='0'/>
    </serial>
    <console type='pty'>
      <target type='serial' port='0'/>
    </console>

Which fails with:

error: Failed to start domain fedora25-aarch64
error: internal error: process exited while connecting to monitor:
2017-06-26T13:55:34.726293Z qemu-system-aarch64: -chardev pty,id=charserial0:
char device redirected to /dev/pts/5 (label charserial0)
2017-06-26T13:55:34.782121Z qemu-system-aarch64: -device
isa-serial,chardev=charserial0,id=serial0: No 'ISA' bus found for device
'isa-serial'

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---
 src/qemu/qemu_capabilities.c | 5 -----
 1 file changed, 5 deletions(-)

-- 
2.13.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Comments

Andrea Bolognani June 27, 2017, 5:22 a.m. | #1
On Mon, 2017-06-26 at 14:01 -0400, Cole Robinson wrote:
> This reverts commit 70c9b44270f75bfb7a5701d81aa49380d139e8f0.

> This commit breaks existing aarch64 machvirt configs with:

>     <serial type='pty'>
>       <target port='0'/>
>     </serial>
>     <console type='pty'>
>       <target type='serial' port='0'/>
>     </console>

> Which fails with:

> error: Failed to start domain fedora25-aarch64
> error: internal error: process exited while connecting to monitor:
> 2017-06-26T13:55:34.726293Z qemu-system-aarch64: -chardev pty,id=charserial0:
> char device redirected to /dev/pts/5 (label charserial0)
> 2017-06-26T13:55:34.782121Z qemu-system-aarch64: -device
> isa-serial,chardev=charserial0,id=serial0: No 'ISA' bus found for device
> 'isa-serial'

> Signed-off-by: Cole Robinson <crobinso@redhat.com>

Reviewed-by: Andrea Bolognani <abologna@redhat.com>

I will probably not be able to look at the rest of the series
for a few more days, so please go ahead and push this one
right away so at least the regression will be gone.

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Cole Robinson June 27, 2017, 1:16 p.m. | #2
On 06/27/2017 01:22 AM, Andrea Bolognani wrote:
> On Mon, 2017-06-26 at 14:01 -0400, Cole Robinson wrote:

>> This reverts commit 70c9b44270f75bfb7a5701d81aa49380d139e8f0.

>>  

>> This commit breaks existing aarch64 machvirt configs with:

>>  

>>      <serial type='pty'>

>>        <target port='0'/>

>>      </serial>

>>      <console type='pty'>

>>        <target type='serial' port='0'/>

>>      </console>

>>  

>> Which fails with:

>>  

>> error: Failed to start domain fedora25-aarch64

>> error: internal error: process exited while connecting to monitor:

>> 2017-06-26T13:55:34.726293Z qemu-system-aarch64: -chardev pty,id=charserial0:

>> char device redirected to /dev/pts/5 (label charserial0)

>> 2017-06-26T13:55:34.782121Z qemu-system-aarch64: -device

>> isa-serial,chardev=charserial0,id=serial0: No 'ISA' bus found for device

>> 'isa-serial'

>>  

>> Signed-off-by: Cole Robinson <crobinso@redhat.com>

> 

> Reviewed-by: Andrea Bolognani <abologna@redhat.com>

> 

> I will probably not be able to look at the rest of the series

> for a few more days, so please go ahead and push this one

> right away so at least the regression will be gone.

> 


Sounds good, I've pushed this one now

- Cole


--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patch

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 12d9477cf..61c9a1066 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5573,11 +5573,6 @@  virQEMUCapsSupportsChardev(const virDomainDef *def,
     if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64))
         return true;
 
-    /* The virt machine has a PCIe bus and allows plugging in the same type of
-     * devices as x86 systems do on a PCIe bus. */
-    if (qemuDomainIsVirt(def))
-        return true;
-
     /* This may not be true for all ARM machine types, but at least
      * the only supported non-virtio serial devices of vexpress and versatile
      * don't have the -chardev property wired up. */