[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 9/9] pc_piix/pc_sysfw: enable flash by default
From: |
Jordan Justen |
Subject: |
[Qemu-devel] [PATCH v11 9/9] pc_piix/pc_sysfw: enable flash by default |
Date: |
Tue, 21 Feb 2012 23:18:56 -0800 |
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 <address@hidden>
---
hw/pc_piix.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
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 fcf0153..fe7a729 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 972706c..abf9004 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(),
};
--
1.7.1
- [Qemu-devel] [PATCH v11 0/9] PC system flash support, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 1/9] blockdev: allow read-only pflash devices, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 2/9] pflash_cfi01/02: support read-only pflash devices, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 7/9] hw/pc_piix: remove is_default for pc-0.15, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 6/9] hw/pc_sysfw: support system flash memory with pflash, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 8/9] hw/pc_piix: add pc-1.1, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 3/9] vl: make find_default_machine externally visible, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 9/9] pc_piix/pc_sysfw: enable flash by default,
Jordan Justen <=
- [Qemu-devel] [PATCH v11 4/9] hw/pc: move rom init to pc_sysfw.c, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 5/9] hw/pc_sysfw: enable pc-sysfw as a qdev, Jordan Justen, 2012/02/22
- Re: [Qemu-devel] [PATCH v11 0/9] PC system flash support, Anthony Liguori, 2012/02/22