diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2012-02-21 23:18:56 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-22 09:02:18 -0600 |
| commit | 1b89fafe47b74e458f5e179b6c0e56c8b2633b62 (patch) | |
| tree | f78813b2b9a515ccbd352b722d8c47a53deaad26 | |
| parent | 382b3a681d002749f22cb87ec6b523432f81e8f2 (diff) | |
pc_piix/pc_sysfw: enable flash by default
Now, the pc-sysfw:rom_only property will default
to false which enables flash by default.
All pc types below pc-1.1 set rom_only to true.
This prevents flash from being enabled on these
pc machine types.
For pc-1.1 rom_only will use the default (false),
which will allow flash to be used for pc-1.1.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/pc_piix.c | 49 | ||||
| -rw-r--r-- | hw/pc_sysfw.c | 2 |
2 files changed, 50 insertions, 1 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index fcf0153d37..fe7a729472 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -385,6 +385,14 @@ static QEMUMachine pc_machine_v1_0 = { .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, + .compat_props = (GlobalProperty[]) { + { + .driver = "pc-sysfw", + .property = "rom_only", + .value = stringify(1), + }, + { /* end of list */ } + }, }; static QEMUMachine pc_machine_v0_15 = { @@ -392,6 +400,14 @@ static QEMUMachine pc_machine_v0_15 = { .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, + .compat_props = (GlobalProperty[]) { + { + .driver = "pc-sysfw", + .property = "rom_only", + .value = stringify(1), + }, + { /* end of list */ } + }, }; static QEMUMachine pc_machine_v0_14 = { @@ -425,6 +441,11 @@ static QEMUMachine pc_machine_v0_14 = { .property = "event_idx", .value = "off", }, + { + .driver = "pc-sysfw", + .property = "rom_only", + .value = stringify(1), + }, { /* end of list */ } }, }; @@ -472,6 +493,11 @@ static QEMUMachine pc_machine_v0_13 = { .property = "use_broken_id", .value = stringify(1), }, + { + .driver = "pc-sysfw", + .property = "rom_only", + .value = stringify(1), + }, { /* end of list */ } }, }; @@ -523,6 +549,11 @@ static QEMUMachine pc_machine_v0_12 = { .property = "use_broken_id", .value = stringify(1), }, + { + .driver = "pc-sysfw", + .property = "rom_only", + .value = stringify(1), + }, { /* end of list */ } } }; @@ -582,6 +613,11 @@ static QEMUMachine pc_machine_v0_11 = { .property = "use_broken_id", .value = stringify(1), }, + { + .driver = "pc-sysfw", + .property = "rom_only", + .value = stringify(1), + }, { /* end of list */ } } }; @@ -653,6 +689,11 @@ static QEMUMachine pc_machine_v0_10 = { .property = "use_broken_id", .value = stringify(1), }, + { + .driver = "pc-sysfw", + .property = "rom_only", + .value = stringify(1), + }, { /* end of list */ } }, }; @@ -662,6 +703,14 @@ static QEMUMachine isapc_machine = { .desc = "ISA-only PC", .init = pc_init_isa, .max_cpus = 1, + .compat_props = (GlobalProperty[]) { + { + .driver = "pc-sysfw", + .property = "rom_only", + .value = stringify(1), + }, + { /* end of list */ } + }, }; #ifdef CONFIG_XEN diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c index 972706c1fa..abf9004182 100644 --- a/hw/pc_sysfw.c +++ b/hw/pc_sysfw.c @@ -226,7 +226,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory) } static Property pcsysfw_properties[] = { - DEFINE_PROP_UINT8("rom_only", PcSysFwDevice, rom_only, 1), + DEFINE_PROP_UINT8("rom_only", PcSysFwDevice, rom_only, 0), DEFINE_PROP_END_OF_LIST(), }; |