mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
iQIcBAABAgAGBQJYLcu7AAoJENro4Ql1lpzl5D8P/0Mkfa9BzTGTBfE5bF4Z0kH+
 0i+5Nw95NeiOWsW35DL2I5uIdeJpQ8Iwu22r/rfjV2PKJlO+/NgGZq59vp0Xk+vJ
 BcGi/sSTyTJUXtxJdqzZ0wDoKRt3qjCjg4wLjJN+BsPWBGlbDrSyQer21qgKT6mZ
 dPDTSpngX5isp/dM7AsZu74iGsPIlDxDXwR3M5st/6zHkhnZLUWVyT2TXqhJ4zwp
 W+iM2yhkOp5zXnv69gnLuTyG5WLR+xd7fo4MIzfCen/APOIYmuIJBHmrIrzGlOmc
 ftCEj1kSYJMadWIlm5XzmPry8rXNFkQzx1D6k8d5shk3ZD0vCpZTz0sGn7HsLRoy
 oDadNLdrDeCv6idISrvDqmHE6XmDrZ0Qk33Pl/r1LPBVLPLBavWA/TUuP4Kpem/f
 UTPnezVKuCf3pYCW2t4e8O1AHSyTMr2RtzYoiSNDcbP93xG77MSo6izfGSkIlRlM
 gsuD+NxXKvUVAH7qSYerYriK7DxIgkRiJnQboVPYxiF2wi/jgJn1TvONynfdrO/L
 +kCuslJUqBKwZZYul8v/Lz8xdbentSAJwdoeebYzpnt64MAVbf4A3g7BX57O8L5j
 G0Fg2USfCHuiWxeI3MMu6ZLhksfPWZtEclVaAxKTOMrtByvkhwFQJjo8N2jBWeXo
 BXfkz+X/VyZA3z8V+e9U
 =EZeB
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Stefan Hajnoczi 2016-11-18 14:58:48 +00:00
commit ad538782d7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/misc/ivshmem.c
View File

@ -858,7 +858,7 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp)
pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY,
&s->ivshmem_mmio); &s->ivshmem_mmio);
if (!s->not_legacy_32bit) { if (s->not_legacy_32bit) {
attr |= PCI_BASE_ADDRESS_MEM_TYPE_64; attr |= PCI_BASE_ADDRESS_MEM_TYPE_64;
} }
@ -1045,6 +1045,7 @@ static void ivshmem_plain_init(Object *obj)
ivshmem_check_memdev_is_busy, ivshmem_check_memdev_is_busy,
OBJ_PROP_LINK_UNREF_ON_RELEASE, OBJ_PROP_LINK_UNREF_ON_RELEASE,
&error_abort); &error_abort);
s->not_legacy_32bit = 1;
} }
static void ivshmem_plain_realize(PCIDevice *dev, Error **errp) 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->features |= (1 << IVSHMEM_MSI);
s->legacy_size = SIZE_MAX; /* whatever the server sends */ s->legacy_size = SIZE_MAX; /* whatever the server sends */
s->not_legacy_32bit = 1;
} }
static void ivshmem_doorbell_realize(PCIDevice *dev, Error **errp) static void ivshmem_doorbell_realize(PCIDevice *dev, Error **errp)