* [Qemu-devel] [PATCH v10 1/8] blockdev: allow read-only pflash devices
2012-01-08 19:51 [Qemu-devel] [PATCH v10 0/8] PC system flash support Jordan Justen
@ 2012-01-08 19:51 ` Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 2/8] pflash_cfi01/02: support " Jordan Justen
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Jordan Justen @ 2012-01-08 19:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Jordan Justen
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
blockdev.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index c832782..2d1b8f7 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -557,7 +557,8 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi)
/* CDROM is fine for any interface, don't check. */
ro = 1;
} else if (ro == 1) {
- if (type != IF_SCSI && type != IF_VIRTIO && type != IF_FLOPPY && type != IF_NONE) {
+ if (type != IF_SCSI && type != IF_VIRTIO && type != IF_FLOPPY &&
+ type != IF_NONE && type != IF_PFLASH) {
error_report("readonly not supported by this bus type");
goto err;
}
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH v10 2/8] pflash_cfi01/02: support read-only pflash devices
2012-01-08 19:51 [Qemu-devel] [PATCH v10 0/8] PC system flash support Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 1/8] blockdev: allow read-only pflash devices Jordan Justen
@ 2012-01-08 19:51 ` Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 3/8] vl: make find_default_machine externally visible Jordan Justen
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Jordan Justen @ 2012-01-08 19:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Jordan Justen
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
hw/pflash_cfi01.c | 44 +++++++++++++++++++---------
hw/pflash_cfi02.c | 83 ++++++++++++++++++++++++++++------------------------
2 files changed, 75 insertions(+), 52 deletions(-)
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index ee0c3ba..b03f623 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -283,8 +283,12 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
TARGET_FMT_plx "\n",
__func__, offset, pfl->sector_len);
- memset(p + offset, 0xff, pfl->sector_len);
- pflash_update(pfl, offset, pfl->sector_len);
+ if (!pfl->ro) {
+ memset(p + offset, 0xff, pfl->sector_len);
+ pflash_update(pfl, offset, pfl->sector_len);
+ } else {
+ pfl->status |= 0x20; /* Block erase error */
+ }
pfl->status |= 0x80; /* Ready! */
break;
case 0x50: /* Clear status bits */
@@ -323,8 +327,12 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
case 0x10: /* Single Byte Program */
case 0x40: /* Single Byte Program */
DPRINTF("%s: Single Byte Program\n", __func__);
- pflash_data_write(pfl, offset, value, width, be);
- pflash_update(pfl, offset, width);
+ if (!pfl->ro) {
+ pflash_data_write(pfl, offset, value, width, be);
+ pflash_update(pfl, offset, width);
+ } else {
+ pfl->status |= 0x10; /* Programming error */
+ }
pfl->status |= 0x80; /* Ready! */
pfl->wcycle = 0;
break;
@@ -372,7 +380,11 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
case 2:
switch (pfl->cmd) {
case 0xe8: /* Block write */
- pflash_data_write(pfl, offset, value, width, be);
+ if (!pfl->ro) {
+ pflash_data_write(pfl, offset, value, width, be);
+ } else {
+ pfl->status |= 0x10; /* Programming error */
+ }
pfl->status |= 0x80;
@@ -382,8 +394,12 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
DPRINTF("%s: block write finished\n", __func__);
pfl->wcycle++;
- /* Flush the entire write buffer onto backing storage. */
- pflash_update(pfl, offset & mask, pfl->writeblock_size);
+ if (!pfl->ro) {
+ /* Flush the entire write buffer onto backing storage. */
+ pflash_update(pfl, offset & mask, pfl->writeblock_size);
+ } else {
+ pfl->status |= 0x10; /* Programming error */
+ }
}
pfl->counter--;
@@ -607,13 +623,13 @@ pflash_t *pflash_cfi01_register(target_phys_addr_t base,
}
bdrv_attach_dev_nofail(pfl->bs, pfl);
}
-#if 0 /* XXX: there should be a bit to set up read-only,
- * the same way the hardware does (with WP pin).
- */
- pfl->ro = 1;
-#else
- pfl->ro = 0;
-#endif
+
+ if (pfl->bs) {
+ pfl->ro = bdrv_is_read_only(pfl->bs);
+ } else {
+ pfl->ro = 0;
+ }
+
pfl->timer = qemu_new_timer_ns(vm_clock, pflash_timer, pfl);
pfl->base = base;
pfl->sector_len = sector_len;
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index a9e88b9..2c1cd2f 100644
--- a/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@ -329,35 +329,37 @@ static void pflash_write (pflash_t *pfl, target_phys_addr_t offset,
DPRINTF("%s: write data offset " TARGET_FMT_plx " %08x %d\n",
__func__, offset, value, width);
p = pfl->storage;
- switch (width) {
- case 1:
- p[offset] &= value;
- pflash_update(pfl, offset, 1);
- break;
- case 2:
- if (be) {
- p[offset] &= value >> 8;
- p[offset + 1] &= value;
- } else {
+ if (!pfl->ro) {
+ switch (width) {
+ case 1:
p[offset] &= value;
- p[offset + 1] &= value >> 8;
+ pflash_update(pfl, offset, 1);
+ break;
+ case 2:
+ if (be) {
+ p[offset] &= value >> 8;
+ p[offset + 1] &= value;
+ } else {
+ p[offset] &= value;
+ p[offset + 1] &= value >> 8;
+ }
+ pflash_update(pfl, offset, 2);
+ break;
+ case 4:
+ if (be) {
+ p[offset] &= value >> 24;
+ p[offset + 1] &= value >> 16;
+ p[offset + 2] &= value >> 8;
+ p[offset + 3] &= value;
+ } else {
+ p[offset] &= value;
+ p[offset + 1] &= value >> 8;
+ p[offset + 2] &= value >> 16;
+ p[offset + 3] &= value >> 24;
+ }
+ pflash_update(pfl, offset, 4);
+ break;
}
- pflash_update(pfl, offset, 2);
- break;
- case 4:
- if (be) {
- p[offset] &= value >> 24;
- p[offset + 1] &= value >> 16;
- p[offset + 2] &= value >> 8;
- p[offset + 3] &= value;
- } else {
- p[offset] &= value;
- p[offset + 1] &= value >> 8;
- p[offset + 2] &= value >> 16;
- p[offset + 3] &= value >> 24;
- }
- pflash_update(pfl, offset, 4);
- break;
}
pfl->status = 0x00 | ~(value & 0x80);
/* Let's pretend write is immediate */
@@ -403,9 +405,11 @@ static void pflash_write (pflash_t *pfl, target_phys_addr_t offset,
}
/* Chip erase */
DPRINTF("%s: start chip erase\n", __func__);
- memset(pfl->storage, 0xFF, pfl->chip_len);
+ if (!pfl->ro) {
+ memset(pfl->storage, 0xFF, pfl->chip_len);
+ pflash_update(pfl, 0, pfl->chip_len);
+ }
pfl->status = 0x00;
- pflash_update(pfl, 0, pfl->chip_len);
/* Let's wait 5 seconds before chip erase is done */
qemu_mod_timer(pfl->timer,
qemu_get_clock_ns(vm_clock) + (get_ticks_per_sec() * 5));
@@ -416,8 +420,10 @@ static void pflash_write (pflash_t *pfl, target_phys_addr_t offset,
offset &= ~(pfl->sector_len - 1);
DPRINTF("%s: start sector erase at " TARGET_FMT_plx "\n", __func__,
offset);
- memset(p + offset, 0xFF, pfl->sector_len);
- pflash_update(pfl, offset, pfl->sector_len);
+ if (!pfl->ro) {
+ memset(p + offset, 0xFF, pfl->sector_len);
+ pflash_update(pfl, offset, pfl->sector_len);
+ }
pfl->status = 0x00;
/* Let's wait 1/2 second before sector erase is done */
qemu_mod_timer(pfl->timer,
@@ -644,16 +650,17 @@ pflash_t *pflash_cfi02_register(target_phys_addr_t base,
}
bdrv_attach_dev_nofail(pfl->bs, pfl);
}
+
pflash_setup_mappings(pfl);
pfl->rom_mode = 1;
memory_region_add_subregion(get_system_memory(), pfl->base, &pfl->mem);
-#if 0 /* XXX: there should be a bit to set up read-only,
- * the same way the hardware does (with WP pin).
- */
- pfl->ro = 1;
-#else
- pfl->ro = 0;
-#endif
+
+ if (pfl->bs) {
+ pfl->ro = bdrv_is_read_only(pfl->bs);
+ } else {
+ pfl->ro = 0;
+ }
+
pfl->timer = qemu_new_timer_ns(vm_clock, pflash_timer, pfl);
pfl->sector_len = sector_len;
pfl->width = width;
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH v10 3/8] vl: make find_default_machine externally visible
2012-01-08 19:51 [Qemu-devel] [PATCH v10 0/8] PC system flash support Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 1/8] blockdev: allow read-only pflash devices Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 2/8] pflash_cfi01/02: support " Jordan Justen
@ 2012-01-08 19:51 ` Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 4/8] hw/pc: move rom init to pc_sysfw.c Jordan Justen
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Jordan Justen @ 2012-01-08 19:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Jordan Justen
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
hw/boards.h | 1 +
vl.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/hw/boards.h b/hw/boards.h
index 716fd7b..45a31a1 100644
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -33,6 +33,7 @@ typedef struct QEMUMachine {
} QEMUMachine;
int qemu_register_machine(QEMUMachine *m);
+QEMUMachine *find_default_machine(void);
extern QEMUMachine *current_machine;
diff --git a/vl.c b/vl.c
index ba55b35..cb0c135 100644
--- a/vl.c
+++ b/vl.c
@@ -1186,7 +1186,7 @@ static QEMUMachine *find_machine(const char *name)
return NULL;
}
-static QEMUMachine *find_default_machine(void)
+QEMUMachine *find_default_machine(void)
{
QEMUMachine *m;
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH v10 4/8] hw/pc: move rom init to pc_sysfw.c
2012-01-08 19:51 [Qemu-devel] [PATCH v10 0/8] PC system flash support Jordan Justen
` (2 preceding siblings ...)
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 3/8] vl: make find_default_machine externally visible Jordan Justen
@ 2012-01-08 19:51 ` Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 5/8] hw/pc_sysfw: Support system flash memory with pflash Jordan Justen
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Jordan Justen @ 2012-01-08 19:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Jordan Justen
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
Makefile.target | 1 +
hw/pc.c | 56 +++------------------------------
hw/pc.h | 3 ++
hw/pc_sysfw.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 101 insertions(+), 51 deletions(-)
create mode 100644 hw/pc_sysfw.c
diff --git a/Makefile.target b/Makefile.target
index 18be624..eb1123a 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -228,6 +228,7 @@ obj-i386-y += vmport.o
obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
obj-i386-y += debugcon.o multiboot.o
obj-i386-y += pc_piix.o
+obj-i386-y += pc_sysfw.o
obj-i386-$(CONFIG_KVM) += kvmclock.o
obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o
diff --git a/hw/pc.c b/hw/pc.c
index 85304cf..47e946a 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -57,10 +57,6 @@
#define DPRINTF(fmt, ...)
#endif
-#define BIOS_FILENAME "bios.bin"
-
-#define PC_MAX_BIOS_SIZE (4 * 1024 * 1024)
-
/* Leave a chunk of memory at the top of RAM for the BIOS ACPI tables. */
#define ACPI_DATA_SIZE 0x10000
#define BIOS_CFG_IOPORT 0x510
@@ -973,11 +969,9 @@ void pc_memory_init(MemoryRegion *system_memory,
MemoryRegion *rom_memory,
MemoryRegion **ram_memory)
{
- char *filename;
- int ret, linux_boot, i;
- MemoryRegion *ram, *bios, *isa_bios, *option_rom_mr;
+ int linux_boot, i;
+ MemoryRegion *ram, *option_rom_mr;
MemoryRegion *ram_below_4g, *ram_above_4g;
- int bios_size, isa_bios_size;
void *fw_cfg;
linux_boot = (kernel_filename != NULL);
@@ -1003,44 +997,9 @@ void pc_memory_init(MemoryRegion *system_memory,
ram_above_4g);
}
- /* BIOS load */
- if (bios_name == NULL)
- bios_name = BIOS_FILENAME;
- filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
- if (filename) {
- bios_size = get_image_size(filename);
- } else {
- bios_size = -1;
- }
- if (bios_size <= 0 ||
- (bios_size % 65536) != 0) {
- goto bios_error;
- }
- bios = g_malloc(sizeof(*bios));
- memory_region_init_ram(bios, "pc.bios", bios_size);
- vmstate_register_ram_global(bios);
- memory_region_set_readonly(bios, true);
- ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1);
- if (ret != 0) {
- bios_error:
- fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", bios_name);
- exit(1);
- }
- if (filename) {
- g_free(filename);
- }
- /* map the last 128KB of the BIOS in ISA space */
- isa_bios_size = bios_size;
- if (isa_bios_size > (128 * 1024))
- isa_bios_size = 128 * 1024;
- isa_bios = g_malloc(sizeof(*isa_bios));
- memory_region_init_alias(isa_bios, "isa-bios", bios,
- bios_size - isa_bios_size, isa_bios_size);
- memory_region_add_subregion_overlap(rom_memory,
- 0x100000 - isa_bios_size,
- isa_bios,
- 1);
- memory_region_set_readonly(isa_bios, true);
+
+ /* Initialize PC system firmware */
+ pc_system_firmware_init(rom_memory);
option_rom_mr = g_malloc(sizeof(*option_rom_mr));
memory_region_init_ram(option_rom_mr, "pc.rom", PC_ROM_SIZE);
@@ -1050,11 +1009,6 @@ void pc_memory_init(MemoryRegion *system_memory,
option_rom_mr,
1);
- /* map all the bios at the top of memory */
- memory_region_add_subregion(rom_memory,
- (uint32_t)(-bios_size),
- bios);
-
fw_cfg = bochs_bios_init();
rom_set_fw(fw_cfg);
diff --git a/hw/pc.h b/hw/pc.h
index 13e41f1..227f495 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -246,6 +246,9 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)
return true;
}
+/* pc_sysfw.c */
+void pc_system_firmware_init(MemoryRegion *rom_memory);
+
/* e820 types */
#define E820_RAM 1
#define E820_RESERVED 2
diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c
new file mode 100644
index 0000000..3121c95
--- /dev/null
+++ b/hw/pc_sysfw.c
@@ -0,0 +1,92 @@
+/*
+ * QEMU PC System Firmware
+ *
+ * Copyright (c) 2003-2004 Fabrice Bellard
+ * Copyright (c) 2011 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "pc.h"
+#include "loader.h"
+#include "sysemu.h"
+
+#define BIOS_FILENAME "bios.bin"
+
+static void pc_system_rom_init(MemoryRegion *rom_memory)
+{
+ char *filename;
+ MemoryRegion *bios, *isa_bios;
+ int bios_size, isa_bios_size;
+ int ret;
+
+ /* BIOS load */
+ if (bios_name == NULL) {
+ bios_name = BIOS_FILENAME;
+ }
+ filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
+ if (filename) {
+ bios_size = get_image_size(filename);
+ } else {
+ bios_size = -1;
+ }
+ if (bios_size <= 0 ||
+ (bios_size % 65536) != 0) {
+ goto bios_error;
+ }
+ bios = g_malloc(sizeof(*bios));
+ memory_region_init_ram(bios, "pc.bios", bios_size);
+ vmstate_register_ram_global(bios);
+ memory_region_set_readonly(bios, true);
+ ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1);
+ if (ret != 0) {
+ bios_error:
+ fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", bios_name);
+ exit(1);
+ }
+ if (filename) {
+ g_free(filename);
+ }
+
+ /* map the last 128KB of the BIOS in ISA space */
+ isa_bios_size = bios_size;
+ if (isa_bios_size > (128 * 1024)) {
+ isa_bios_size = 128 * 1024;
+ }
+ isa_bios = g_malloc(sizeof(*isa_bios));
+ memory_region_init_alias(isa_bios, "isa-bios", bios,
+ bios_size - isa_bios_size, isa_bios_size);
+ memory_region_add_subregion_overlap(rom_memory,
+ 0x100000 - isa_bios_size,
+ isa_bios,
+ 1);
+ memory_region_set_readonly(isa_bios, true);
+
+ /* map all the bios at the top of memory */
+ memory_region_add_subregion(rom_memory,
+ (uint32_t)(-bios_size),
+ bios);
+}
+
+void pc_system_firmware_init(MemoryRegion *rom_memory)
+{
+ pc_system_rom_init(rom_memory);
+}
+
+
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH v10 5/8] hw/pc_sysfw: Support system flash memory with pflash
2012-01-08 19:51 [Qemu-devel] [PATCH v10 0/8] PC system flash support Jordan Justen
` (3 preceding siblings ...)
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 4/8] hw/pc: move rom init to pc_sysfw.c Jordan Justen
@ 2012-01-08 19:51 ` Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 6/8] hw/pc_piix: remove is_default for pc-0.15 Jordan Justen
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Jordan Justen @ 2012-01-08 19:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Jordan Justen
Flash can be enabled by calling pc_system_firmware_init
with the system_flash_enabled parameter being non-zero.
If system_flash_enabled is zero, then the older qemu
rom creation method will be used.
If flash is enabled and a pflash image is found, then
it is used for the system firmware image.
If flash is enabled and a pflash image is not initially
found, then a read-only pflash device is created using
the -bios filename.
KVM cannot execute from a pflash region currently.
Therefore, when KVM is enabled, a (read-only) ram memory
region is created and filled with the contents of the
pflash drive.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
default-configs/i386-softmmu.mak | 1 +
default-configs/x86_64-softmmu.mak | 1 +
hw/pc.c | 2 +-
hw/pc.h | 3 +-
hw/pc_sysfw.c | 172 +++++++++++++++++++++++++++++++++++-
5 files changed, 173 insertions(+), 6 deletions(-)
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index e67ebb3..cd407a9 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -22,3 +22,4 @@ CONFIG_SOUND=y
CONFIG_HPET=y
CONFIG_APPLESMC=y
CONFIG_I8259=y
+CONFIG_PFLASH_CFI01=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index b75757e..47734ea 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -22,3 +22,4 @@ CONFIG_SOUND=y
CONFIG_HPET=y
CONFIG_APPLESMC=y
CONFIG_I8259=y
+CONFIG_PFLASH_CFI01=y
diff --git a/hw/pc.c b/hw/pc.c
index 47e946a..7a7af90 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -999,7 +999,7 @@ void pc_memory_init(MemoryRegion *system_memory,
/* Initialize PC system firmware */
- pc_system_firmware_init(rom_memory);
+ pc_system_firmware_init(rom_memory, 0);
option_rom_mr = g_malloc(sizeof(*option_rom_mr));
memory_region_init_ram(option_rom_mr, "pc.rom", PC_ROM_SIZE);
diff --git a/hw/pc.h b/hw/pc.h
index 227f495..ca5e76b 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -247,7 +247,8 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)
}
/* pc_sysfw.c */
-void pc_system_firmware_init(MemoryRegion *rom_memory);
+void pc_system_firmware_init(MemoryRegion *rom_memory,
+ int system_flash_enabled);
/* e820 types */
#define E820_RAM 1
diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c
index 3121c95..57ac81c 100644
--- a/hw/pc_sysfw.c
+++ b/hw/pc_sysfw.c
@@ -23,13 +23,151 @@
* THE SOFTWARE.
*/
+#include "hw.h"
#include "pc.h"
+#include "hw/boards.h"
#include "loader.h"
#include "sysemu.h"
+#include "flash.h"
+#include "kvm.h"
#define BIOS_FILENAME "bios.bin"
-static void pc_system_rom_init(MemoryRegion *rom_memory)
+static void pc_isa_bios_init(MemoryRegion *rom_memory,
+ MemoryRegion *flash_mem,
+ int ram_size)
+{
+ int isa_bios_size;
+ MemoryRegion *isa_bios;
+ uint64_t flash_size;
+ void *flash_ptr, *isa_bios_ptr;
+
+ flash_size = memory_region_size(flash_mem);
+
+ /* map the last 128KB of the BIOS in ISA space */
+ isa_bios_size = flash_size;
+ if (isa_bios_size > (128 * 1024)) {
+ isa_bios_size = 128 * 1024;
+ }
+ isa_bios = g_malloc(sizeof(*isa_bios));
+ memory_region_init_ram(isa_bios, "isa-bios", isa_bios_size);
+ vmstate_register_ram_global(isa_bios);
+ memory_region_add_subregion_overlap(rom_memory,
+ 0x100000 - isa_bios_size,
+ isa_bios,
+ 1);
+
+ /* copy ISA rom image from top of flash memory */
+ flash_ptr = memory_region_get_ram_ptr(flash_mem);
+ isa_bios_ptr = memory_region_get_ram_ptr(isa_bios);
+ memcpy(isa_bios_ptr,
+ ((uint8_t*)flash_ptr) + (flash_size - isa_bios_size),
+ isa_bios_size);
+
+ memory_region_set_readonly(isa_bios, true);
+}
+
+static void pc_fw_add_pflash_drv(void)
+{
+ QemuOpts *opts;
+ QEMUMachine *machine;
+ char *filename;
+
+ if (bios_name == NULL) {
+ bios_name = BIOS_FILENAME;
+ }
+ filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
+
+ opts = drive_add(IF_PFLASH, -1, filename, "readonly=on");
+ if (opts == NULL) {
+ return;
+ }
+
+ machine = find_default_machine();
+ if (machine == NULL) {
+ return;
+ }
+
+ drive_init(opts, machine->use_scsi);
+}
+
+static void pc_system_flash_init(MemoryRegion *rom_memory,
+ DriveInfo *pflash_drv)
+{
+ BlockDriverState *bdrv;
+ int64_t size;
+ target_phys_addr_t phys_addr;
+ int sector_bits, sector_size;
+ pflash_t *system_flash;
+ MemoryRegion *flash_mem;
+
+ bdrv = pflash_drv->bdrv;
+ size = bdrv_getlength(pflash_drv->bdrv);
+ sector_bits = 12;
+ sector_size = 1 << sector_bits;
+
+ if ((size % sector_size) != 0) {
+ fprintf(stderr,
+ "qemu: PC system firmware (pflash) must be a multiple of 0x%x\n",
+ sector_size);
+ exit(1);
+ }
+
+ phys_addr = 0x100000000ULL - size;
+ system_flash = pflash_cfi01_register(phys_addr, NULL, "system.flash", size,
+ bdrv, sector_size, size >> sector_bits,
+ 1, 0x0000, 0x0000, 0x0000, 0x0000, 0);
+ flash_mem = pflash_cfi01_get_memory(system_flash);
+
+ pc_isa_bios_init(rom_memory, flash_mem, size);
+}
+
+static void pc_system_rom_init(MemoryRegion *rom_memory,
+ DriveInfo *pflash_drv)
+{
+ BlockDriverState *bdrv;
+ int64_t size;
+ target_phys_addr_t phys_addr;
+ int sector_bits, sector_size;
+ MemoryRegion *sys_rom;
+ void *buffer;
+ int ret;
+
+ bdrv = pflash_drv->bdrv;
+ size = bdrv_getlength(pflash_drv->bdrv);
+ sector_bits = 9;
+ sector_size = 1 << sector_bits;
+
+ if ((size % sector_size) != 0) {
+ fprintf(stderr,
+ "qemu: PC system rom (pflash) must be a multiple of 0x%x\n",
+ sector_size);
+ exit(1);
+ }
+
+ phys_addr = 0x100000000ULL - size;
+ sys_rom = g_malloc(sizeof(*sys_rom));
+ memory_region_init_ram(sys_rom, "system.rom", size);
+ vmstate_register_ram_global(sys_rom);
+ buffer = memory_region_get_ram_ptr(sys_rom);
+ memory_region_add_subregion(rom_memory, phys_addr, sys_rom);
+
+ /* read the rom content */
+ ret = bdrv_read(bdrv, 0, buffer, size >> sector_bits);
+ if (ret < 0) {
+ memory_region_destroy(sys_rom);
+ g_free(sys_rom);
+ fprintf(stderr,
+ "qemu: Failed to read rom image from pflash drive\n");
+ exit(1);
+ }
+
+ memory_region_set_readonly(sys_rom, true);
+
+ pc_isa_bios_init(rom_memory, sys_rom, size);
+}
+
+static void old_pc_system_rom_init(MemoryRegion *rom_memory)
{
char *filename;
MemoryRegion *bios, *isa_bios;
@@ -84,9 +222,35 @@ static void pc_system_rom_init(MemoryRegion *rom_memory)
bios);
}
-void pc_system_firmware_init(MemoryRegion *rom_memory)
+void pc_system_firmware_init(MemoryRegion *rom_memory,
+ int system_flash_enabled)
{
- pc_system_rom_init(rom_memory);
-}
+ int flash_present;
+ DriveInfo *pflash_drv;
+
+ if (!system_flash_enabled) {
+ old_pc_system_rom_init(rom_memory);
+ return;
+ }
+
+ pflash_drv = drive_get(IF_PFLASH, 0, 0);
+ flash_present = (pflash_drv != NULL);
+ if (!flash_present) {
+ pc_fw_add_pflash_drv();
+ pflash_drv = drive_get(IF_PFLASH, 0, 0);
+ flash_present = (pflash_drv != NULL);
+ }
+
+ if (!flash_present) {
+ fprintf(stderr, "qemu: PC system firmware (pflash) not available\n");
+ exit(1);
+ }
+
+ if (!kvm_enabled()) {
+ pc_system_flash_init(rom_memory, pflash_drv);
+ } else {
+ pc_system_rom_init(rom_memory, pflash_drv);
+ }
+}
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH v10 6/8] hw/pc_piix: remove is_default for pc-0.15
2012-01-08 19:51 [Qemu-devel] [PATCH v10 0/8] PC system flash support Jordan Justen
` (4 preceding siblings ...)
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 5/8] hw/pc_sysfw: Support system flash memory with pflash Jordan Justen
@ 2012-01-08 19:51 ` Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1 Jordan Justen
` (2 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Jordan Justen @ 2012-01-08 19:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Jordan Justen
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
hw/pc_piix.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index b70431f..00f525e 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -328,7 +328,6 @@ static QEMUMachine pc_machine_v0_15 = {
.desc = "Standard PC",
.init = pc_init_pci,
.max_cpus = 255,
- .is_default = 1,
};
static QEMUMachine pc_machine_v0_14 = {
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1
2012-01-08 19:51 [Qemu-devel] [PATCH v10 0/8] PC system flash support Jordan Justen
` (5 preceding siblings ...)
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 6/8] hw/pc_piix: remove is_default for pc-0.15 Jordan Justen
@ 2012-01-08 19:51 ` Jordan Justen
2012-01-09 0:12 ` Alexander Graf
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 8/8] pc: enable system flash for pc-1.1 Jordan Justen
2012-01-08 19:59 ` [Qemu-devel] [PATCH v10 0/8] PC system flash support Jordan Justen
8 siblings, 1 reply; 12+ messages in thread
From: Jordan Justen @ 2012-01-08 19:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Jordan Justen
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
hw/pc_piix.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 00f525e..aea95e4 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -314,8 +314,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
}
#endif
-static QEMUMachine pc_machine_v1_0 = {
- .name = "pc-1.0",
+static QEMUMachine pc_machine_v1_1 = {
+ .name = "pc-1.1",
.alias = "pc",
.desc = "Standard PC",
.init = pc_init_pci,
@@ -323,6 +323,13 @@ static QEMUMachine pc_machine_v1_0 = {
.is_default = 1,
};
+static QEMUMachine pc_machine_v1_0 = {
+ .name = "pc-1.0",
+ .desc = "Standard PC",
+ .init = pc_init_pci,
+ .max_cpus = 255,
+};
+
static QEMUMachine pc_machine_v0_15 = {
.name = "pc-0.15",
.desc = "Standard PC",
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1 Jordan Justen
@ 2012-01-09 0:12 ` Alexander Graf
2012-01-09 1:11 ` Jordan Justen
0 siblings, 1 reply; 12+ messages in thread
From: Alexander Graf @ 2012-01-09 0:12 UTC (permalink / raw)
To: Jordan Justen; +Cc: qemu-devel
On 08.01.2012, at 20:51, Jordan Justen wrote:
> Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
> ---
> hw/pc_piix.c | 11 +++++++++--
> 1 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index 00f525e..aea95e4 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -314,8 +314,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
> }
> #endif
>
> -static QEMUMachine pc_machine_v1_0 = {
> - .name = "pc-1.0",
> +static QEMUMachine pc_machine_v1_1 = {
> + .name = "pc-1.1",
> .alias = "pc",
> .desc = "Standard PC",
> .init = pc_init_pci,
> @@ -323,6 +323,13 @@ static QEMUMachine pc_machine_v1_0 = {
> .is_default = 1,
> };
>
> +static QEMUMachine pc_machine_v1_0 = {
> + .name = "pc-1.0",
> + .desc = "Standard PC",
> + .init = pc_init_pci,
> + .max_cpus = 255,
> +};
> +
> static QEMUMachine pc_machine_v0_15 = {
> .name = "pc-0.15",
> .desc = "Standard PC",
This is missing registration of the v1.1 machine, no? Please see my -cpu best default patch I just posted.
Alex
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1
2012-01-09 0:12 ` Alexander Graf
@ 2012-01-09 1:11 ` Jordan Justen
0 siblings, 0 replies; 12+ messages in thread
From: Jordan Justen @ 2012-01-09 1:11 UTC (permalink / raw)
To: Alexander Graf; +Cc: qemu-devel
On Sun, Jan 8, 2012 at 16:12, Alexander Graf <agraf@suse.de> wrote:
>
> On 08.01.2012, at 20:51, Jordan Justen wrote:
>
>> Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
>> ---
>> hw/pc_piix.c | 11 +++++++++--
>> 1 files changed, 9 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
>> index 00f525e..aea95e4 100644
>> --- a/hw/pc_piix.c
>> +++ b/hw/pc_piix.c
>> @@ -314,8 +314,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
>> }
>> #endif
>>
>> -static QEMUMachine pc_machine_v1_0 = {
>> - .name = "pc-1.0",
>> +static QEMUMachine pc_machine_v1_1 = {
>> + .name = "pc-1.1",
>> .alias = "pc",
>> .desc = "Standard PC",
>> .init = pc_init_pci,
>> @@ -323,6 +323,13 @@ static QEMUMachine pc_machine_v1_0 = {
>> .is_default = 1,
>> };
>>
>> +static QEMUMachine pc_machine_v1_0 = {
>> + .name = "pc-1.0",
>> + .desc = "Standard PC",
>> + .init = pc_init_pci,
>> + .max_cpus = 255,
>> +};
>> +
>> static QEMUMachine pc_machine_v0_15 = {
>> .name = "pc-0.15",
>> .desc = "Standard PC",
>
> This is missing registration of the v1.1 machine, no? Please see my -cpu best default patch I just posted.
Yep, whoops. I was splitting my change apart compared to v9, and it
looks like I mistakenly added the registration portion into patch 8/8.
Now that I see you are adding pc-1.1, it seems likely that I'll
probably be reworking my changeset again after yours is merged.
I also had added that pc-0.15 is_default change into my changeset, but
hopefully you'll have that change merged soon as well.
Thanks,
-Jordan
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PATCH v10 8/8] pc: enable system flash for pc-1.1
2012-01-08 19:51 [Qemu-devel] [PATCH v10 0/8] PC system flash support Jordan Justen
` (6 preceding siblings ...)
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1 Jordan Justen
@ 2012-01-08 19:51 ` Jordan Justen
2012-01-08 19:59 ` [Qemu-devel] [PATCH v10 0/8] PC system flash support Jordan Justen
8 siblings, 0 replies; 12+ messages in thread
From: Jordan Justen @ 2012-01-08 19:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Jordan Justen
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
hw/pc.c | 5 +++--
hw/pc.h | 3 ++-
hw/pc_piix.c | 33 +++++++++++++++++++++++++--------
3 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 7a7af90..4af9974 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -967,7 +967,8 @@ void pc_memory_init(MemoryRegion *system_memory,
ram_addr_t below_4g_mem_size,
ram_addr_t above_4g_mem_size,
MemoryRegion *rom_memory,
- MemoryRegion **ram_memory)
+ MemoryRegion **ram_memory,
+ int system_flash_enabled)
{
int linux_boot, i;
MemoryRegion *ram, *option_rom_mr;
@@ -999,7 +1000,7 @@ void pc_memory_init(MemoryRegion *system_memory,
/* Initialize PC system firmware */
- pc_system_firmware_init(rom_memory, 0);
+ pc_system_firmware_init(rom_memory, system_flash_enabled);
option_rom_mr = g_malloc(sizeof(*option_rom_mr));
memory_region_init_ram(option_rom_mr, "pc.rom", PC_ROM_SIZE);
diff --git a/hw/pc.h b/hw/pc.h
index ca5e76b..c32def1 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -139,7 +139,8 @@ void pc_memory_init(MemoryRegion *system_memory,
ram_addr_t below_4g_mem_size,
ram_addr_t above_4g_mem_size,
MemoryRegion *rom_memory,
- MemoryRegion **ram_memory);
+ MemoryRegion **ram_memory,
+ int system_flash_enabled);
qemu_irq *pc_allocate_cpu_irq(void);
DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus);
void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index aea95e4..c9ace4f 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -79,7 +79,8 @@ static void pc_init1(MemoryRegion *system_memory,
const char *initrd_filename,
const char *cpu_model,
int pci_enabled,
- int kvmclock_enabled)
+ int kvmclock_enabled,
+ int system_flash_enabled)
{
int i;
ram_addr_t below_4g_mem_size, above_4g_mem_size;
@@ -130,7 +131,8 @@ static void pc_init1(MemoryRegion *system_memory,
pc_memory_init(system_memory,
kernel_filename, kernel_cmdline, initrd_filename,
below_4g_mem_size, above_4g_mem_size,
- pci_enabled ? rom_memory : system_memory, &ram_memory);
+ pci_enabled ? rom_memory : system_memory, &ram_memory,
+ system_flash_enabled);
}
gsi_state = g_malloc0(sizeof(*gsi_state));
@@ -263,7 +265,21 @@ static void pc_init_pci(ram_addr_t ram_size,
get_system_io(),
ram_size, boot_device,
kernel_filename, kernel_cmdline,
- initrd_filename, cpu_model, 1, 1);
+ initrd_filename, cpu_model, 1, 1, 1);
+}
+
+static void pc_init_pci_system_rom_only(ram_addr_t ram_size,
+ const char *boot_device,
+ const char *kernel_filename,
+ const char *kernel_cmdline,
+ const char *initrd_filename,
+ const char *cpu_model)
+{
+ pc_init1(get_system_memory(),
+ get_system_io(),
+ ram_size, boot_device,
+ kernel_filename, kernel_cmdline,
+ initrd_filename, cpu_model, 1, 1, 0);
}
static void pc_init_pci_no_kvmclock(ram_addr_t ram_size,
@@ -277,7 +293,7 @@ static void pc_init_pci_no_kvmclock(ram_addr_t ram_size,
get_system_io(),
ram_size, boot_device,
kernel_filename, kernel_cmdline,
- initrd_filename, cpu_model, 1, 0);
+ initrd_filename, cpu_model, 1, 0, 0);
}
static void pc_init_isa(ram_addr_t ram_size,
@@ -293,7 +309,7 @@ static void pc_init_isa(ram_addr_t ram_size,
get_system_io(),
ram_size, boot_device,
kernel_filename, kernel_cmdline,
- initrd_filename, cpu_model, 0, 1);
+ initrd_filename, cpu_model, 0, 1, 0);
}
#ifdef CONFIG_XEN
@@ -326,21 +342,21 @@ static QEMUMachine pc_machine_v1_1 = {
static QEMUMachine pc_machine_v1_0 = {
.name = "pc-1.0",
.desc = "Standard PC",
- .init = pc_init_pci,
+ .init = pc_init_pci_system_rom_only,
.max_cpus = 255,
};
static QEMUMachine pc_machine_v0_15 = {
.name = "pc-0.15",
.desc = "Standard PC",
- .init = pc_init_pci,
+ .init = pc_init_pci_system_rom_only,
.max_cpus = 255,
};
static QEMUMachine pc_machine_v0_14 = {
.name = "pc-0.14",
.desc = "Standard PC",
- .init = pc_init_pci,
+ .init = pc_init_pci_system_rom_only,
.max_cpus = 255,
.compat_props = (GlobalProperty[]) {
{
@@ -619,6 +635,7 @@ static QEMUMachine xenfv_machine = {
static void pc_machine_init(void)
{
+ qemu_register_machine(&pc_machine_v1_1);
qemu_register_machine(&pc_machine_v1_0);
qemu_register_machine(&pc_machine_v0_15);
qemu_register_machine(&pc_machine_v0_14);
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Qemu-devel] [PATCH v10 0/8] PC system flash support
2012-01-08 19:51 [Qemu-devel] [PATCH v10 0/8] PC system flash support Jordan Justen
` (7 preceding siblings ...)
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 8/8] pc: enable system flash for pc-1.1 Jordan Justen
@ 2012-01-08 19:59 ` Jordan Justen
8 siblings, 0 replies; 12+ messages in thread
From: Jordan Justen @ 2012-01-08 19:59 UTC (permalink / raw)
To: qemu-devel
This currently depends on Avi's patch to avoid an assert during boot.
* Fix vmstate_register_ram() for rom/device regions
-Jordan
On Sun, Jan 8, 2012 at 11:51, Jordan Justen <jordan.l.justen@intel.com> wrote:
> Enable flash emulation in a PC system using pflash_cfi01.
>
> v10:
> * Rebase to HEAD
> * "decouple vmstate from memory API" as in c5705a7
> * Break changes into smaller pieces
>
> v9:
> * Add pc-1.1
> * pc-1.0 uses previous rom firmware init code path
>
> v8:
> * Cleanup two chunks of debug code (printf messages)
> * Fix comment in pc.h (pcflash.c => pc_sysfw.c)
>
> v7:
> * Do not add system firmware to qemu roms
> * If kvm is enabled, copy pflash drive contents into a
> read-only ram region, since kvm cannot currently execute
> code from a pflash device.
> * Rename pcflash.c to pc_sysfw.c
>
> v6:
> * Rebase for memory API
> * pflash_cfi01: Set error in status register when a write to
> erase is attempted in read-only mode.
> * Add system firmware to qemu roms
>
> v5:
> * Enable pflash read-only mode
> * Enable -drive with if=pflash to define system firmware image
>
> v4:
> * Rebase
>
> v3:
> * Fix code style issues
> * Add additional comments
>
> v2:
> * Convert debug printf to DPRINTF
>
> Jordan Justen (8):
> blockdev: allow read-only pflash devices
> pflash_cfi01/02: support read-only pflash devices
> vl: make find_default_machine externally visible
> hw/pc: move rom init to pc_sysfw.c
> hw/pc_sysfw: Support system flash memory with pflash
> hw/pc_piix: remove is_default for pc-0.15
> hw/pc_piix: add pc-1.1
> pc: enable system flash for pc-1.1
>
> Makefile.target | 1 +
> blockdev.c | 3 +-
> default-configs/i386-softmmu.mak | 1 +
> default-configs/x86_64-softmmu.mak | 1 +
> hw/boards.h | 1 +
> hw/pc.c | 59 +--------
> hw/pc.h | 7 +-
> hw/pc_piix.c | 43 +++++--
> hw/pc_sysfw.c | 256 ++++++++++++++++++++++++++++++++++++
> hw/pflash_cfi01.c | 44 ++++--
> hw/pflash_cfi02.c | 83 +++++++------
> vl.c | 2 +-
> 12 files changed, 384 insertions(+), 117 deletions(-)
> create mode 100644 hw/pc_sysfw.c
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread