| Message ID | 20190712145017.17879-1-julio.montes@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/i386: turn off vmport if CONFIG_VMPORT is disabled | expand |
On 12/07/19 16:50, Julio Montes wrote: > vmport device is not included when CONFIG_VMPORT is disabled, hence > QEMU fails with the following error: > > `Unknown device 'vmport' for bus 'ISA': unknown.` > > Signed-off-by: Julio Montes <julio.montes@intel.com> > --- > hw/i386/pc.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index c33ce47578..549c437050 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -83,6 +83,7 @@ > #include "hw/mem/memory-device.h" > #include "sysemu/replay.h" > #include "qapi/qmp/qerror.h" > +#include "config-devices.h" > > /* debug PC/ISA interrupts */ > //#define DEBUG_IRQ > @@ -2793,7 +2794,11 @@ static void pc_machine_initfn(Object *obj) > > pcms->max_ram_below_4g = 0; /* use default */ > pcms->smm = ON_OFF_AUTO_AUTO; > +#ifdef CONFIG_VMPORT > pcms->vmport = ON_OFF_AUTO_AUTO; > +#else > + pcms->vmport = ON_OFF_AUTO_OFF; > +#endif /* CONFIG_VMPORT */ > /* acpi build is enabled by default if machine supports it */ > pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build; > pcms->smbus_enabled = true; > Do we also want to make it "imply VMPORT" instead of "select"? Paolo
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c33ce47578..549c437050 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -83,6 +83,7 @@ #include "hw/mem/memory-device.h" #include "sysemu/replay.h" #include "qapi/qmp/qerror.h" +#include "config-devices.h" /* debug PC/ISA interrupts */ //#define DEBUG_IRQ @@ -2793,7 +2794,11 @@ static void pc_machine_initfn(Object *obj) pcms->max_ram_below_4g = 0; /* use default */ pcms->smm = ON_OFF_AUTO_AUTO; +#ifdef CONFIG_VMPORT pcms->vmport = ON_OFF_AUTO_AUTO; +#else + pcms->vmport = ON_OFF_AUTO_OFF; +#endif /* CONFIG_VMPORT */ /* acpi build is enabled by default if machine supports it */ pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build; pcms->smbus_enabled = true;
vmport device is not included when CONFIG_VMPORT is disabled, hence QEMU fails with the following error: `Unknown device 'vmport' for bus 'ISA': unknown.` Signed-off-by: Julio Montes <julio.montes@intel.com> --- hw/i386/pc.c | 5 +++++ 1 file changed, 5 insertions(+)