[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v2 5/5] ne2k_isa: add property for option rom lo
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [RFC PATCH v2 5/5] ne2k_isa: add property for option rom loading. |
Date: |
Wed, 7 Oct 2009 14:36:36 +0200 |
Moving option rom loading from machine init to the (nic) drivers.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/ne2000-isa.c | 9 +++++++++
hw/ne2000.h | 1 +
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c
index 7a24088..1d296a0 100644
--- a/hw/ne2000-isa.c
+++ b/hw/ne2000-isa.c
@@ -27,6 +27,7 @@
#include "qdev.h"
#include "net.h"
#include "ne2000.h"
+#include "loader.h"
typedef struct ISANE2000State {
ISADevice dev;
@@ -78,6 +79,13 @@ static int isa_ne2000_initfn(ISADevice *dev)
qemu_error("warning: no vlan specfied, ne2k_isa is unconnected\n");
}
+ if (s->pxe) {
+ if (rom_add_option("pxe-ne2k_isa.bin") != 0) {
+ qemu_error("warning: loading rom pxe-ne2k_isa.bin failed\n");
+ s->pxe = 0;
+ }
+ }
+
register_savevm("ne2000", -1, 2, ne2000_save, ne2000_load, s);
return 0;
}
@@ -104,6 +112,7 @@ static ISADeviceInfo ne2000_isa_info = {
.qdev.props = (Property[]) {
DEFINE_PROP_HEX32("iobase", ISANE2000State, iobase, 0x300),
DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 9),
+ DEFINE_PROP_UINT32("pxe", ISANE2000State, ne2000.pxe, 0),
DEFINE_PROP_MACADDR("mac", ISANE2000State, ne2000.macaddr),
DEFINE_PROP_INT32("vlan", ISANE2000State, ne2000.vlan, -1),
DEFINE_PROP_END_OF_LIST(),
diff --git a/hw/ne2000.h b/hw/ne2000.h
index 7936fb2..febaf6a 100644
--- a/hw/ne2000.h
+++ b/hw/ne2000.h
@@ -23,6 +23,7 @@ typedef struct NE2000State {
uint8_t mult[8]; /* multicast mask array */
qemu_irq irq;
int32_t vlan;
+ uint32_t pxe;
VLANClientState *vc;
macaddr_t macaddr;
uint8_t mem[NE2000_MEM_SIZE];
--
1.6.2.5
- [Qemu-devel] [RfC PATCH v2 0/5] qdev-ify network cards, Gerd Hoffmann, 2009/10/07
- [Qemu-devel] [RFC PATCH v2 4/5] ne2k_isa: qdev-ify., Gerd Hoffmann, 2009/10/07
- [Qemu-devel] [RFC PATCH v2 5/5] ne2k_isa: add property for option rom loading.,
Gerd Hoffmann <=
- Re: [Qemu-devel] [RFC PATCH v2 5/5] ne2k_isa: add property for option rom loading., Anthony Liguori, 2009/10/07
- Re: [Qemu-devel] [RFC PATCH v2 5/5] ne2k_isa: add property for option rom loading., Gerd Hoffmann, 2009/10/07
- Re: [Qemu-devel] [RFC PATCH v2 5/5] ne2k_isa: add property for option rom loading., Anthony Liguori, 2009/10/07
- Re: [Qemu-devel] [RFC PATCH v2 5/5] ne2k_isa: add property for option rom loading., Gerd Hoffmann, 2009/10/07
- Re: [Qemu-devel] [RFC PATCH v2 5/5] ne2k_isa: add property for option rom loading., Anthony Liguori, 2009/10/07
- Re: [Qemu-devel] [RFC PATCH v2 5/5] ne2k_isa: add property for option rom loading., Gerd Hoffmann, 2009/10/07
- Re: [Qemu-devel] [RFC PATCH v2 5/5] ne2k_isa: add property for option rom loading., Anthony Liguori, 2009/10/07
- Re: [Qemu-devel] [RFC PATCH v2 5/5] ne2k_isa: add property for option rom loading., Gerd Hoffmann, 2009/10/12
[Qemu-devel] [RFC PATCH v2 2/5] qdev: mac addr property fixups, Gerd Hoffmann, 2009/10/07
[Qemu-devel] [RFC PATCH v2 3/5] ne2k: work without vlan., Gerd Hoffmann, 2009/10/07