diff options
| -rw-r--r-- | hw/core/qdev-properties.c | 2 | ||||
| -rw-r--r-- | hw/i386/pc_piix.c | 2 | ||||
| -rw-r--r-- | hw/net/virtio-net.c | 1 | ||||
| -rw-r--r-- | hw/virtio/virtio-pci.c | 6 | ||||
| -rw-r--r-- | include/hw/qdev-properties.h | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index e9e686f..04fd80a 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -130,7 +130,7 @@ PropertyInfo qdev_prop_bit = { static uint64_t qdev_get_prop_mask64(Property *prop) { - assert(prop->info == &qdev_prop_bit); + assert(prop->info == &qdev_prop_bit64); return 0x1ull << prop->bitnr; } diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 8167b12..a896624 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -492,7 +492,7 @@ DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL, static void pc_i440fx_2_3_machine_options(MachineClass *m) { - pc_i440fx_machine_options(m); + pc_i440fx_2_4_machine_options(m); m->alias = NULL; m->is_default = 0; SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index d728233..e3c2db3 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -466,7 +466,6 @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features) } if (!get_vhost_net(nc->peer)) { - virtio_add_feature(&features, VIRTIO_F_VERSION_1); return features; } return vhost_net_get_features(get_vhost_net(nc->peer), features); diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index ccca2b6..283401a 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -546,7 +546,8 @@ static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, off = le32_to_cpu(cfg->cap.offset); len = le32_to_cpu(cfg->cap.length); - if (len <= sizeof cfg->pci_cfg_data) { + if (len == 1 || len == 2 || len == 4) { + assert(len <= sizeof cfg->pci_cfg_data); virtio_address_space_write(&proxy->modern_as, off, cfg->pci_cfg_data, len); } @@ -570,7 +571,8 @@ static uint32_t virtio_read_config(PCIDevice *pci_dev, off = le32_to_cpu(cfg->cap.offset); len = le32_to_cpu(cfg->cap.length); - if (len <= sizeof cfg->pci_cfg_data) { + if (len == 1 || len == 2 || len == 4) { + assert(len <= sizeof cfg->pci_cfg_data); virtio_address_space_read(&proxy->modern_as, off, cfg->pci_cfg_data, len); } diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 0cfff1c..77538a8 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -53,7 +53,7 @@ extern PropertyInfo qdev_prop_arraylen; } #define DEFINE_PROP_BIT64(_name, _state, _field, _bit, _defval) { \ .name = (_name), \ - .info = &(qdev_prop_bit), \ + .info = &(qdev_prop_bit64), \ .bitnr = (_bit), \ .offset = offsetof(_state, _field) \ + type_check(uint64_t, typeof_field(_state, _field)), \ |