[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/44] virtio: Make disable-legacy/disable-modern com
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 35/44] virtio: Make disable-legacy/disable-modern compat properties optional |
Date: |
Mon, 14 Jan 2019 20:36:50 -0500 |
From: Eduardo Habkost <address@hidden>
The disable-legacy and disable-modern properties apply only to
some virtio-pci devices. Make those properties optional.
This fixes the crash introduced by commit f6e501a28ef9 ("virtio: Provide
version-specific variants of virtio PCI devices"):
$ qemu-system-x86_64 -machine pc-i440fx-2.6 \
-device virtio-net-pci-non-transitional
Unexpected error in object_property_find() at qom/object.c:1092:
qemu-system-x86_64: -device virtio-net-pci-non-transitional: can't apply \
global virtio-pci.disable-modern=on: Property '.disable-modern' not found
Aborted (core dumped)
Reported-by: Thomas Huth <address@hidden>
Fixes: f6e501a28ef9 ("virtio: Provide version-specific variants of virtio PCI
devices")
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/core/machine.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 95dc7c3913..f0c0ae6be8 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -91,8 +91,9 @@ const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7);
GlobalProperty hw_compat_2_6[] = {
{ "virtio-mmio", "format_transport_address", "off" },
- { "virtio-pci", "disable-modern", "on" },
- { "virtio-pci", "disable-legacy", "off" },
+ /* Optional because not all virtio-pci devices support legacy mode */
+ { "virtio-pci", "disable-modern", "on", .optional = true },
+ { "virtio-pci", "disable-legacy", "off", .optional = true },
};
const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6);
--
MST
- [Qemu-devel] [PULL 40/44] acpi: build TPM Physical Presence interface, (continued)
- [Qemu-devel] [PULL 40/44] acpi: build TPM Physical Presence interface, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 39/44] acpi: expose TPM/PPI configuration parameters to firmware via fw_cfg, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 38/44] tpm: allocate/map buffer for TPM Physical Presence interface, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 36/44] hw/misc/edu: add msi_uninit() for pci_edu_uninit(), Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 37/44] tpm: add a "ppi" boolean property, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 34/44] globals: Allow global properties to be optional, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 33/44] virtio: virtio 9p really requires CONFIG_VIRTFS to work, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 29/44] virtio: split virtio net bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 25/44] virtio: split vhost user scsi bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 24/44] virtio: split vhost user blk bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 35/44] virtio: Make disable-legacy/disable-modern compat properties optional,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 32/44] virtio: split virtio crypto bits from virtio-pci.h, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 31/44] virtio: split virtio gpu bits from virtio-pci.h, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 20/44] virtio: split virtio input bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 19/44] virtio: split virtio input host bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 18/44] virtio: split vhost vsock bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 22/44] virtio: split virtio balloon bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 30/44] virtio: split virtio serial bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 28/44] virtio: split virtio blk bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 27/44] virtio: split virtio scsi bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 15/44] tests: acpi: use AcpiSdtTable::aml instead of AcpiSdtTable::header::signature, Michael S. Tsirkin, 2019/01/14