qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [RfC PATCH v3 10/10] ne2k_pci: load rom.
Date: Fri, 16 Oct 2009 15:42:03 +0200	[thread overview]
Message-ID: <1255700523-15270-11-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1255700523-15270-1-git-send-email-kraxel@redhat.com>


Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/ne2000.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/hw/ne2000.c b/hw/ne2000.c
index f296b10..6cb5f58 100644
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -25,6 +25,7 @@
 #include "pci.h"
 #include "net.h"
 #include "ne2000.h"
+#include "loader.h"
 
 /* debug NE2000 card */
 //#define DEBUG_NE2000
@@ -767,6 +768,14 @@ static int pci_ne2000_init(PCIDevice *pci_dev)
                                  ne2000_cleanup, s);
     qemu_format_nic_info_str(s->vc, s->c.macaddr.a);
 
+    if (!pci_dev->qdev.hotplugged) {
+        static int loaded = 0;
+        if (!loaded) {
+            rom_add_option("pxe-ne2k_pci.bin");
+            loaded = 1;
+        }
+    }
+
     register_savevm("ne2000", -1, 3, pci_ne2000_save, pci_ne2000_load, d);
     return 0;
 }
-- 
1.6.2.5

  parent reply	other threads:[~2009-10-16 13:42 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-16 13:41 [Qemu-devel] [RfC PATCH v3 00/10] qdev-ify network cards Gerd Hoffmann
2009-10-16 13:41 ` [Qemu-devel] [RfC PATCH v3 01/10] net: macaddr tweaks Gerd Hoffmann
2009-10-16 13:41 ` [Qemu-devel] [RfC PATCH v3 02/10] qdev: mac addr property fixups Gerd Hoffmann
2009-10-16 13:41 ` [Qemu-devel] [RfC PATCH v3 03/10] qdev: add netdev property Gerd Hoffmann
2009-10-16 13:41 ` [Qemu-devel] [RfC PATCH v3 04/10] qdev: add vlan property Gerd Hoffmann
2009-10-16 13:41 ` [Qemu-devel] [RfC PATCH v3 05/10] qdev/net: common nic property bits Gerd Hoffmann
2009-10-16 13:41 ` [Qemu-devel] [RfC PATCH v3 06/10] ne2k_isa: qdev-ify Gerd Hoffmann
2009-10-16 13:42 ` [Qemu-devel] [RfC PATCH v3 07/10] qdev: add qdev_prop_exists() Gerd Hoffmann
2009-10-16 13:42 ` [Qemu-devel] [RfC PATCH v3 08/10] prepare pci nic init path for qdev conversion Gerd Hoffmann
2009-10-16 13:42 ` [Qemu-devel] [RfC PATCH v3 09/10] ne2k_pci: qdev-ify Gerd Hoffmann
2009-10-16 13:42 ` Gerd Hoffmann [this message]
2009-10-19  8:59 ` [Qemu-devel] [RfC PATCH v3 00/10] qdev-ify network cards Mark McLoughlin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1255700523-15270-11-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).