github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 13:37:10 +00:00
Code Issues Projects Releases Wiki Activity

DM: lpc_deinit doesn't release all resources allocated.

Browse Source 
Also refine the failure path of lpc_init to make sure all
resources allocated get release.

Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Yin Fengwei 2018-04-13 15:17:06 +08:00 committed by lijinxia
parent 28f7aa820b
commit a8f1180799
1 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
hw/pci/lpc.c
View File

@ -155,6 +155,38 @@ lpc_uart_io_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
return 0; return 0;
} }
static void
lpc_deinit(struct vmctx *ctx)
{
struct lpc_uart_vdev *lpc_uart;
struct inout_port iop;
const char *name;
int unit;
/* COM1 and COM2 */
for (unit = 0; unit < LPC_UART_NUM; unit++) {
name = lpc_uart_names[unit];
lpc_uart = &lpc_uart_vdev[unit];
if (lpc_uart->enabled == 0)
continue;
bzero(&iop, sizeof(struct inout_port));
iop.name = name;
iop.port = lpc_uart->iobase;
iop.size = UART_IO_BAR_SIZE;
iop.flags = IOPORT_F_INOUT;
unregister_inout(&iop);
uart_release_backend(lpc_uart->uart, lpc_uart->opts);
uart_deinit(lpc_uart->uart);
uart_legacy_dealloc(unit);
lpc_uart->uart = NULL;
lpc_uart->enabled = 0;
}
}
static int static int
lpc_init(struct vmctx *ctx) lpc_init(struct vmctx *ctx)
{ {
@ -173,17 +205,24 @@ lpc_init(struct vmctx *ctx)
&lpc_uart->irq) != 0) { &lpc_uart->irq) != 0) {
fprintf(stderr, "Unable to allocate resources for " fprintf(stderr, "Unable to allocate resources for "
"LPC device %s\n", name); "LPC device %s\n", name);
return -1; goto init_failed;
} }
pci_irq_reserve(lpc_uart->irq); pci_irq_reserve(lpc_uart->irq);
lpc_uart->uart = uart_init(lpc_uart_intr_assert, lpc_uart->uart = uart_init(lpc_uart_intr_assert,
lpc_uart_intr_deassert, lpc_uart); lpc_uart_intr_deassert, lpc_uart);
if (lpc_uart->uart < 0) {
uart_legacy_dealloc(unit);
goto init_failed;
}
if (uart_set_backend(lpc_uart->uart, lpc_uart->opts) != 0) { if (uart_set_backend(lpc_uart->uart, lpc_uart->opts) != 0) {
fprintf(stderr, "Unable to initialize backend '%s' " fprintf(stderr, "Unable to initialize backend '%s' "
"for LPC device %s\n", lpc_uart->opts, name); "for LPC device %s\n", lpc_uart->opts, name);
return -1; uart_deinit(lpc_uart->uart);
uart_legacy_dealloc(unit);
goto init_failed;
} }
bzero(&iop, sizeof(struct inout_port)); bzero(&iop, sizeof(struct inout_port));
@ -200,23 +239,10 @@ lpc_init(struct vmctx *ctx)
} }
return 0; return 0;
}
static void init_failed:
lpc_deinit(struct vmctx *ctx) lpc_deinit(ctx);
{ return -1;
struct lpc_uart_vdev *lpc_uart;
int unit;
/* COM1 and COM2 */
for (unit = 0; unit < LPC_UART_NUM; unit++) {
lpc_uart = &lpc_uart_vdev[unit];
uart_legacy_dealloc(unit);
uart_deinit(lpc_uart->uart);
lpc_uart->uart = NULL;
lpc_uart->enabled = 0;
}
} }
static void static void