diff options
| author | Stefan Hajnoczi | 2016-11-18 15:58:48 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi | 2016-11-18 15:58:48 +0100 |
| commit | ad538782d78e46878d1c1cb24582d51bd266c626 (patch) | |
| tree | 92cc61f533aadfd926c939fc8b8034f26bfaac24 /hw | |
| parent | Merge remote-tracking branch 'rth/tags/pull-axp-20161117' into staging (diff) | |
| parent | ivshmem: Fix 64 bit memory bar configuration (diff) | |
| download | qemu-ad538782d78e46878d1c1cb24582d51bd266c626.tar.gz qemu-ad538782d78e46878d1c1cb24582d51bd266c626.tar.xz qemu-ad538782d78e46878d1c1cb24582d51bd266c626.zip | |
Merge remote-tracking branch 'remotes/elmarco/tags/ivshmem-pull-request' into staging
* remotes/elmarco/tags/ivshmem-pull-request:
ivshmem: Fix 64 bit memory bar configuration
Message-id: 20161117152613.18578-1-marcandre.lureau@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/misc/ivshmem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 230e51b6e0..abeaf3da08 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -858,7 +858,7 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp) pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->ivshmem_mmio); - if (!s->not_legacy_32bit) { + if (s->not_legacy_32bit) { attr |= PCI_BASE_ADDRESS_MEM_TYPE_64; } @@ -1045,6 +1045,7 @@ static void ivshmem_plain_init(Object *obj) ivshmem_check_memdev_is_busy, OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort); + s->not_legacy_32bit = 1; } static void ivshmem_plain_realize(PCIDevice *dev, Error **errp) @@ -1116,6 +1117,7 @@ static void ivshmem_doorbell_init(Object *obj) s->features |= (1 << IVSHMEM_MSI); s->legacy_size = SIZE_MAX; /* whatever the server sends */ + s->not_legacy_32bit = 1; } static void ivshmem_doorbell_realize(PCIDevice *dev, Error **errp) |