Commit 8c57b867 authored by Alexander Graf's avatar Alexander Graf
Browse files

PPC: spapr: Rework VGA select logic 



When selecting our VGA adapter, we want to:

  * fail completely when we can't satisfy the user's request
  * support -nographic where no VGA adapter should be spawned

This patch reworks the logic so we fulfill the two conditions above.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent a5b71725

hw/spapr.c

+9 −4
Original line number Diff line number Diff line
@@ -563,16 +563,21 @@ static void spapr_cpu_reset(void *opaque) 
    cpu_reset(CPU(cpu));

}



/* Returns whether we want to use VGA or not */

static int spapr_vga_init(PCIBus *pci_bus)

{

    if (std_vga_enabled) {

    switch (vga_interface_type) {

    case VGA_STD:

        pci_vga_init(pci_bus);

    } else {

        return 1;

    case VGA_NONE:

        return 0;

    default:

        fprintf(stderr, "This vga model is not supported,"

                "currently it only supports -vga std\n");

        return 0;

        exit(0);

        break;

    }

    return 1;

}



/* pSeries LPAR / sPAPR hardware init */