Skip to contentSkip to conversation

virtio-mem-pci: force virtio version 1

PATCH Superseded David Hildenbrand 3 participants 6 messages Jul 8, 2020 – Jul 27, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 virtio-mem-pci: force virtio version 1

Let's force virtio version 1. While at it, use qdev_realize() to set the parent bus and realize - like most other virtio-*-pci implementations.

Fixes 0b9a2443a48b ("virtio-pci: Proxy for virtio-mem")
Cc Cornelia Huck <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
---
 hw/virtio/virtio-mem-pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/virtio/virtio-mem-pci.c +2 -2
index 1a8e854123..831022aa86 100644
@@ -21,8 +21,8 @@ static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
     VirtIOMEMPCI *mem_pci = VIRTIO_MEM_PCI(vpci_dev);
     DeviceState *vdev = DEVICE(&mem_pci->vdev);
 
-    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
-    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
+    virtio_pci_force_virtio_1(vpci_dev);
+    qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
 }
 
 static void virtio_mem_pci_set_addr(MemoryDeviceState *md, uint64_t addr,
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · On Wed, 8 Jul 2020 16:36:19 +0200 David Hildenbrand <[email protected]> wrote:

Let's force virtio version 1. While at it, use qdev_realize() to set the parent bus and realize - like most other virtio-*-pci implementations.

Yes, there's recently been a mass conversion to qdev_realize().

Quoted 14 lines
Fixes 0b9a2443a48b ("virtio-pci: Proxy for virtio-mem")
Cc Cornelia Huck <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
---
 hw/virtio/virtio-mem-pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/virtio/virtio-mem-pci.c +0 -0
index 1a8e854123..831022aa86 100644

hw/virtio/virtio-mem-pci.c static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) · line 28

Quoted 10 lines
hw/virtio/virtio-mem-pci.c +2 -2
@@ -21,8 +21,8 @@ static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
     VirtIOMEMPCI *mem_pci = VIRTIO_MEM_PCI(vpci_dev);
     DeviceState *vdev = DEVICE(&mem_pci->vdev);
 
-    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
-    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
+    virtio_pci_force_virtio_1(vpci_dev);
+    qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
 }
 
 static void virtio_mem_pci_set_addr(MemoryDeviceState *md, uint64_t addr,
#2 lore raw
In reply to David Hildenbrand
Quoted 18 lines · David Hildenbrand

Let's force virtio version 1. While at it, use qdev_realize() to set the parent bus and realize - like most other virtio-*-pci implementations.

Fixes 0b9a2443a48b ("virtio-pci: Proxy for virtio-mem")
Cc Cornelia Huck <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
---
 hw/virtio/virtio-mem-pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/virtio/virtio-mem-pci.c +0 -0
index 1a8e854123..831022aa86 100644

hw/virtio/virtio-mem-pci.c static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) · line 28

Quoted 10 lines
hw/virtio/virtio-mem-pci.c +2 -2
@@ -21,8 +21,8 @@ static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
     VirtIOMEMPCI *mem_pci = VIRTIO_MEM_PCI(vpci_dev);
     DeviceState *vdev = DEVICE(&mem_pci->vdev);
 
-    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
-    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
+    virtio_pci_force_virtio_1(vpci_dev);
+    qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
 }
 
 static void virtio_mem_pci_set_addr(MemoryDeviceState *md, uint64_t addr,

Ping @mst

Signature · 3 lines
Thanks,

David / dhildenb
#3 lore raw
Quoted 27 lines · David Hildenbrand
Quoted 26 lines · David Hildenbrand

Let's force virtio version 1. While at it, use qdev_realize() to set the parent bus and realize - like most other virtio-*-pci implementations.

Fixes 0b9a2443a48b ("virtio-pci: Proxy for virtio-mem")
Cc Cornelia Huck <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
---
 hw/virtio/virtio-mem-pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/virtio/virtio-mem-pci.c +2 -2
index 1a8e854123..831022aa86 100644
@@ -21,8 +21,8 @@ static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
     VirtIOMEMPCI *mem_pci = VIRTIO_MEM_PCI(vpci_dev);
     DeviceState *vdev = DEVICE(&mem_pci->vdev);
 
-    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
-    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
+    virtio_pci_force_virtio_1(vpci_dev);
+    qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
 }
 
Quoted 5 lines

hw/virtio/virtio-mem-pci.c static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) · line 28

Quoted 2 lines
hw/virtio/virtio-mem-pci.c +0 -0
 static void virtio_mem_pci_set_addr(MemoryDeviceState *md, uint64_t addr,

Ping @mst

With Conny's patches in, simple virtio-mem examples currently fail with

qemu-system-x86_64: -device virtio-mem-pci,id=vm0,memdev=mem0,node=0,requested-size=300M: device is modern-only, use disable-legacy=on

So we really want this in QEMU 5.1

Signature · 3 lines
Thanks,

David / dhildenb
#4 lore raw
Quoted 34 lines · David Hildenbrand
Quoted 27 lines · David Hildenbrand
Quoted 26 lines · David Hildenbrand

Let's force virtio version 1. While at it, use qdev_realize() to set the parent bus and realize - like most other virtio-*-pci implementations.

Fixes 0b9a2443a48b ("virtio-pci: Proxy for virtio-mem")
Cc Cornelia Huck <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
---
 hw/virtio/virtio-mem-pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/virtio/virtio-mem-pci.c +2 -2
index 1a8e854123..831022aa86 100644
@@ -21,8 +21,8 @@ static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
     VirtIOMEMPCI *mem_pci = VIRTIO_MEM_PCI(vpci_dev);
     DeviceState *vdev = DEVICE(&mem_pci->vdev);
 
-    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
-    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
+    virtio_pci_force_virtio_1(vpci_dev);
+    qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
 }
 
Quoted 5 lines

hw/virtio/virtio-mem-pci.c static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) · line 28

Quoted 2 lines
hw/virtio/virtio-mem-pci.c +0 -0
 static void virtio_mem_pci_set_addr(MemoryDeviceState *md, uint64_t addr,

Ping @mst

Quoted 12 lines

With Conny's patches in, simple virtio-mem examples currently fail with

qemu-system-x86_64: -device virtio-mem-pci,id=vm0,memdev=mem0,node=0,requested-size=300M: device is modern-only, use disable-legacy=on

So we really want this in QEMU 5.1

Signature · 3 lines
Thanks,

David / dhildenb

That's something to note in the commit log btw.

Signature · 1 line
MST
#5 lore raw
Quoted 41 lines · Michael S. Tsirkin
Quoted 40 lines · David Hildenbrand
Quoted 27 lines · David Hildenbrand
Quoted 26 lines · David Hildenbrand

Let's force virtio version 1. While at it, use qdev_realize() to set the parent bus and realize - like most other virtio-*-pci implementations.

Fixes 0b9a2443a48b ("virtio-pci: Proxy for virtio-mem")
Cc Cornelia Huck <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
---
 hw/virtio/virtio-mem-pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/virtio/virtio-mem-pci.c +2 -2
index 1a8e854123..831022aa86 100644
@@ -21,8 +21,8 @@ static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
     VirtIOMEMPCI *mem_pci = VIRTIO_MEM_PCI(vpci_dev);
     DeviceState *vdev = DEVICE(&mem_pci->vdev);
 
-    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
-    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
+    virtio_pci_force_virtio_1(vpci_dev);
+    qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
 }
 
Quoted 5 lines

hw/virtio/virtio-mem-pci.c static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) · line 28

Quoted 2 lines
hw/virtio/virtio-mem-pci.c +0 -0
 static void virtio_mem_pci_set_addr(MemoryDeviceState *md, uint64_t addr,

Ping @mst

With Conny's patches in, simple virtio-mem examples currently fail with

qemu-system-x86_64: -device virtio-mem-pci,id=vm0,memdev=mem0,node=0,requested-size=300M: device is modern-only, use disable-legacy=on

Quoted 8 lines
Quoted 6 lines

So we really want this in QEMU 5.1

Signature · 3 lines
Thanks,

David / dhildenb

That's something to note in the commit log btw.

Sorry, could you rebase pls? You could include the above in the commit log then. Thanks and sorry about the delay!

Quoted 3 lines
Signature · 2 lines
-- 
MST