|
@@ -879,7 +879,7 @@ static void vfio_update_msi(VFIOPCIDevice *vdev)
|
|
|
|
|
|
static void vfio_pci_load_rom(VFIOPCIDevice *vdev)
|
|
static void vfio_pci_load_rom(VFIOPCIDevice *vdev)
|
|
{
|
|
{
|
|
- struct vfio_region_info *reg_info;
|
|
|
|
|
|
+ g_autofree struct vfio_region_info *reg_info = NULL;
|
|
uint64_t size;
|
|
uint64_t size;
|
|
off_t off = 0;
|
|
off_t off = 0;
|
|
ssize_t bytes;
|
|
ssize_t bytes;
|
|
@@ -897,8 +897,6 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev)
|
|
vdev->rom_size = size = reg_info->size;
|
|
vdev->rom_size = size = reg_info->size;
|
|
vdev->rom_offset = reg_info->offset;
|
|
vdev->rom_offset = reg_info->offset;
|
|
|
|
|
|
- g_free(reg_info);
|
|
|
|
-
|
|
|
|
if (!vdev->rom_size) {
|
|
if (!vdev->rom_size) {
|
|
vdev->rom_read_failed = true;
|
|
vdev->rom_read_failed = true;
|
|
error_report("vfio-pci: Cannot read device rom at "
|
|
error_report("vfio-pci: Cannot read device rom at "
|
|
@@ -2668,7 +2666,7 @@ static VFIODeviceOps vfio_pci_ops = {
|
|
bool vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp)
|
|
bool vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp)
|
|
{
|
|
{
|
|
VFIODevice *vbasedev = &vdev->vbasedev;
|
|
VFIODevice *vbasedev = &vdev->vbasedev;
|
|
- struct vfio_region_info *reg_info;
|
|
|
|
|
|
+ g_autofree struct vfio_region_info *reg_info = NULL;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
ret = vfio_get_region_info(vbasedev, VFIO_PCI_VGA_REGION_INDEX, ®_info);
|
|
ret = vfio_get_region_info(vbasedev, VFIO_PCI_VGA_REGION_INDEX, ®_info);
|
|
@@ -2685,7 +2683,6 @@ bool vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp)
|
|
error_setg(errp, "unexpected VGA info, flags 0x%lx, size 0x%lx",
|
|
error_setg(errp, "unexpected VGA info, flags 0x%lx, size 0x%lx",
|
|
(unsigned long)reg_info->flags,
|
|
(unsigned long)reg_info->flags,
|
|
(unsigned long)reg_info->size);
|
|
(unsigned long)reg_info->size);
|
|
- g_free(reg_info);
|
|
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2694,8 +2691,6 @@ bool vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp)
|
|
vdev->vga->fd_offset = reg_info->offset;
|
|
vdev->vga->fd_offset = reg_info->offset;
|
|
vdev->vga->fd = vdev->vbasedev.fd;
|
|
vdev->vga->fd = vdev->vbasedev.fd;
|
|
|
|
|
|
- g_free(reg_info);
|
|
|
|
-
|
|
|
|
vdev->vga->region[QEMU_PCI_VGA_MEM].offset = QEMU_PCI_VGA_MEM_BASE;
|
|
vdev->vga->region[QEMU_PCI_VGA_MEM].offset = QEMU_PCI_VGA_MEM_BASE;
|
|
vdev->vga->region[QEMU_PCI_VGA_MEM].nr = QEMU_PCI_VGA_MEM;
|
|
vdev->vga->region[QEMU_PCI_VGA_MEM].nr = QEMU_PCI_VGA_MEM;
|
|
QLIST_INIT(&vdev->vga->region[QEMU_PCI_VGA_MEM].quirks);
|
|
QLIST_INIT(&vdev->vga->region[QEMU_PCI_VGA_MEM].quirks);
|
|
@@ -2736,7 +2731,7 @@ bool vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp)
|
|
static bool vfio_populate_device(VFIOPCIDevice *vdev, Error **errp)
|
|
static bool vfio_populate_device(VFIOPCIDevice *vdev, Error **errp)
|
|
{
|
|
{
|
|
VFIODevice *vbasedev = &vdev->vbasedev;
|
|
VFIODevice *vbasedev = &vdev->vbasedev;
|
|
- struct vfio_region_info *reg_info;
|
|
|
|
|
|
+ g_autofree struct vfio_region_info *reg_info = NULL;
|
|
struct vfio_irq_info irq_info = { .argsz = sizeof(irq_info) };
|
|
struct vfio_irq_info irq_info = { .argsz = sizeof(irq_info) };
|
|
int i, ret = -1;
|
|
int i, ret = -1;
|
|
|
|
|
|
@@ -2790,8 +2785,6 @@ static bool vfio_populate_device(VFIOPCIDevice *vdev, Error **errp)
|
|
}
|
|
}
|
|
vdev->config_offset = reg_info->offset;
|
|
vdev->config_offset = reg_info->offset;
|
|
|
|
|
|
- g_free(reg_info);
|
|
|
|
-
|
|
|
|
if (vdev->features & VFIO_FEATURE_ENABLE_VGA) {
|
|
if (vdev->features & VFIO_FEATURE_ENABLE_VGA) {
|
|
if (!vfio_populate_vga(vdev, errp)) {
|
|
if (!vfio_populate_vga(vdev, errp)) {
|
|
error_append_hint(errp, "device does not support "
|
|
error_append_hint(errp, "device does not support "
|