Revert "hw: report invalid disable-legacy|modern usage for virtio-1-only devs"
PATCH 1/1 Revert "hw: report invalid disable-legacy|modern usage for virtio-1-only devs"
From: "Dr. David Alan Gilbert" <[email protected]>
This reverts commit f2784eed306449c3d04a71a05ed6463b8289aedf since that accidentally removes the PCIe capabilities from virtio devices because virtio_pci_dc_realize is called before the new 'mode' flag is set.
I keep the expanded hw_compat entry because we've lost the ability to do 'optional'.
--- hw/display/virtio-gpu-pci.c | 4 +--- hw/display/virtio-vga.c | 4 +--- hw/virtio/virtio-crypto-pci.c | 4 +--- hw/virtio/virtio-input-pci.c | 4 +--- hw/virtio/virtio-pci.c | 26 ++++++++++---------------- hw/virtio/virtio-pci.h | 31 ++++++------------------------- 6 files changed, 20 insertions(+), 53 deletions(-)
hw/display/virtio-gpu-pci.c +1 -3
@@ -33,9 +33,7 @@ static void virtio_gpu_pci_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp)Error *local_error =NULL ;qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -if (!virtio_pci_force_virtio_1 (vpci_dev, errp)) { -return ; - } +virtio_pci_force_virtio_1 (vpci_dev);object_property_set_bool (OBJECT (vdev), true,"realized" , &local_error);if (local_error) {
hw/display/virtio-vga.c +1 -3
@@ -137,9 +137,7 @@ static void virtio_vga_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp)/* init virtio bits */ qdev_set_parent_bus (DEVICE (g),BUS (&vpci_dev->bus)); -if (!virtio_pci_force_virtio_1 (vpci_dev, errp)) { -return ; - } +virtio_pci_force_virtio_1 (vpci_dev);object_property_set_bool (OBJECT (g), true,"realized" , &err);if (err) {error_propagate (errp, err);
hw/virtio/virtio-crypto-pci.c +1 -3
@@ -53,9 +53,7 @@ static void virtio_crypto_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) }qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -if (!virtio_pci_force_virtio_1 (vpci_dev, errp)) { -return ; - } +virtio_pci_force_virtio_1 (vpci_dev);object_property_set_bool (OBJECT (vdev), true,"realized" , errp); object_property_set_link(OBJECT(vcrypto), OBJECT(vcrypto->vdev.conf.cryptodev), "cryptodev",
hw/virtio/virtio-input-pci.c +1 -3
@@ -49,9 +49,7 @@ static void virtio_input_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)DeviceState *vdev =DEVICE (&vinput->vdev);qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -if (!virtio_pci_force_virtio_1 (vpci_dev, errp)) { -return ; - } +virtio_pci_force_virtio_1 (vpci_dev);object_property_set_bool (OBJECT (vdev), true,"realized" , errp); }
hw/virtio/virtio-pci.c +10 -16
@@ -1723,22 +1723,16 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)/* PCI BAR regions must be powers of 2 */ pow2ceil(proxy->notify.offset + proxy->notify.size)); -if ((proxy->disable_legacy ==ON_OFF_AUTO_ON ) || - ((proxy->disable_legacy ==ON_OFF_AUTO_AUTO ) && pcie_port)) { -if (proxy->disable_modern) { -error_setg (errp,"device cannot work as neither modern nor " -"legacy mode is enabled" ); -error_append_hint (errp,"Set either disable-modern or " -"disable-legacy to off\n" ); -return ; - } - proxy->mode =VIRTIO_PCI_MODE_MODERN ; - }else { -if (proxy->disable_modern) { - proxy->mode =VIRTIO_PCI_MODE_LEGACY ; - }else { - proxy->mode =VIRTIO_PCI_MODE_TRANSITIONAL ; - } +if (proxy->disable_legacy ==ON_OFF_AUTO_AUTO ) { + proxy->disable_legacy = pcie_port ?ON_OFF_AUTO_ON :ON_OFF_AUTO_OFF ; + } + +if (!virtio_pci_modern (proxy) && !virtio_pci_legacy (proxy)) { +error_setg (errp,"device cannot work as neither modern nor legacy mode" +" is enabled" ); +error_append_hint (errp,"Set either disable-modern or disable-legacy" +" to off\n" ); +return ; }if (pcie_port &&pci_is_express (pci_dev)) {
hw/virtio/virtio-pci.h +6 -25
@@ -15,7 +15,6 @@#ifndef QEMU_VIRTIO_PCI_H #define QEMU_VIRTIO_PCI_H -#include "qapi/error.h" #include "hw/pci/msi.h" #include "hw/virtio/virtio-bus.h"
@@ -119,12 +118,6 @@ typedef struct VirtIOPCIQueue {uint32_t used[2 ]; } VirtIOPCIQueue; -typedef enum { -VIRTIO_PCI_MODE_LEGACY , -VIRTIO_PCI_MODE_TRANSITIONAL , -VIRTIO_PCI_MODE_MODERN , -}VirtIOPCIMode ; -struct VirtIOPCIProxy {PCIDevice pci_dev;MemoryRegion bar;
@@ -149,7 +142,6 @@ struct VirtIOPCIProxy {bool disable_modern;bool ignore_backend_features;OnOffAuto disable_legacy; -VirtIOPCIMode mode;uint32_t class_code;uint32_t nvectors;uint32_t dfselect;
@@ -164,34 +156,23 @@ struct VirtIOPCIProxy {static inline bool virtio_pci_modern (VirtIOPCIProxy *proxy) { -return proxy->mode !=VIRTIO_PCI_MODE_LEGACY ; +return !proxy->disable_modern; }static inline bool virtio_pci_legacy (VirtIOPCIProxy *proxy) { -return proxy->mode !=VIRTIO_PCI_MODE_MODERN ; +return proxy->disable_legacy ==ON_OFF_AUTO_OFF ; } -static inline bool virtio_pci_force_virtio_1 (VirtIOPCIProxy *proxy, -Error **errp) +static inline void virtio_pci_force_virtio_1 (VirtIOPCIProxy *proxy) { -if (proxy->disable_legacy ==ON_OFF_AUTO_OFF ) { -error_setg (errp,"Unable to set disable-legacy=off on a virtio-1.0 " -"only device" ); -return false; - } -if (proxy->disable_modern == true) { -error_setg (errp,"Unable to set disable-modern=on on a virtio-1.0 " -"only device" ); -return false; - } - proxy->mode =VIRTIO_PCI_MODE_MODERN ; -return true; + proxy->disable_modern = false; + proxy->disable_legacy =ON_OFF_AUTO_ON ; }static inline void virtio_pci_disable_modern (VirtIOPCIProxy *proxy) { - proxy->mode =VIRTIO_PCI_MODE_LEGACY ; + proxy->disable_modern = true; }/*
Signature · 1 line
2.21.0
Quoted 8 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
This reverts commit
f2784eed306449c3d04a71a05ed6463b8289aedfsince that accidentally removes the PCIe capabilities from virtio devices becausevirtio_pci_dc_realizeis called before the new 'mode' flag is set.
I keep the expandedhw_compatentry because we've lost the ability to do 'optional'.
That was the commit immediately following. If you revert 8fa70dbd8bb478d9483c1da3e9976a2d86b3f9a0 first, then this one would likely revert cleanly.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 10 lines · * Daniel P. Berrangé ([email protected]) wrote:
Quoted 8 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
This reverts commit
f2784eed306449c3d04a71a05ed6463b8289aedfsince that accidentally removes the PCIe capabilities from virtio devices becausevirtio_pci_dc_realizeis called before the new 'mode' flag is set.
I keep the expandedhw_compatentry because we've lost the ability to do 'optional'.
Quoted 3 lines
That was the commit immediately following. If you revert
8fa70dbd8bb478d9483c1da3e9976a2d86b3f9a0first, then this one would likely revert cleanly.
OK, double revert coming up.
Dave
Quoted 7 lines
Regards,
DanielSignature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 6 lines · On Mon, 29 Jul 2019 16:59:09 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
This reverts commit
f2784eed306449c3d04a71a05ed6463b8289aedfsince that accidentally removes the PCIe capabilities from virtio devices becausevirtio_pci_dc_realizeis called before the new 'mode' flag is set.
Yes, this is probably too hairy to fix for 4.1; but the change might be worthwhile to revisit for 4.2.
Quoted 4 lines
I keep the expanded
hw_compatentry because we've lost the ability to do 'optional'.Signed-off-by Dr. David Alan Gilbert <[email protected]>
Quoted 8 lines
--- hw/display/virtio-gpu-pci.c | 4 +--- hw/display/virtio-vga.c | 4 +--- hw/virtio/virtio-crypto-pci.c | 4 +--- hw/virtio/virtio-input-pci.c | 4 +--- hw/virtio/virtio-pci.c | 26 ++++++++++---------------- hw/virtio/virtio-pci.h | 31 ++++++------------------------- 6 files changed, 20 insertions(+), 53 deletions(-)