[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH] eepro100: Update ROM file support
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] Re: [PATCH] eepro100: Update ROM file support |
Date: |
Mon, 11 Jan 2010 20:37:57 +0200 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
On Thu, Jan 07, 2010 at 05:13:30PM +0100, Stefan Weil wrote:
> Use new way to associate ROM files to devices.
>
> Currently, there is only a ROM file for i82559er
> included in QEMU, so the patch does not add
> .romfile for the other devices.
>
> When flexible mode is fixed in eepro100, adding
> more ROM files will be possible. It should be
> possible to create them from pxe-i82559er.bin,
> because etherboot uses the same driver for all
> eepro100 devices (only PCI ids differ).
>
> Maybe it is even possible to create a single
> pxe-i8255x.bin which supports all eepro100 devices
> (not supported with current etherboot).
>
> Signed-off-by: Stefan Weil <address@hidden>
Gerd, could you ack this patch please?
Thanks!
> ---
> hw/eepro100.c | 11 +----------
> 1 files changed, 1 insertions(+), 10 deletions(-)
>
> diff --git a/hw/eepro100.c b/hw/eepro100.c
> index a21c984..b33dbb8 100644
> --- a/hw/eepro100.c
> +++ b/hw/eepro100.c
> @@ -40,7 +40,6 @@
> #include <stddef.h> /* offsetof */
> #include <stdbool.h>
> #include "hw.h"
> -#include "loader.h" /* rom_add_option */
> #include "pci.h"
> #include "net.h"
> #include "eeprom93xx.h"
> @@ -1894,15 +1893,6 @@ static int nic_init(PCIDevice *pci_dev, uint32_t
> device)
> s->vmstate->name = s->nic->nc.model;
> vmstate_register(-1, s->vmstate, s);
>
> - if (!pci_dev->qdev.hotplugged) {
> - static int loaded = 0;
> - if (!loaded) {
> - char fname[32];
> - snprintf(fname, sizeof(fname), "pxe-%s.bin", s->nic->nc.model);
> - rom_add_option(fname);
> - loaded = 1;
> - }
> - }
> return 0;
> }
>
> @@ -2062,6 +2052,7 @@ static PCIDeviceInfo eepro100_info[] = {
> .qdev.size = sizeof(EEPRO100State),
> .init = pci_i82559er_init,
> .exit = pci_nic_uninit,
> + .romfile = "pxe-i82559er.bin",
> .qdev.props = (Property[]) {
> DEFINE_NIC_PROPERTIES(EEPRO100State, conf),
> DEFINE_PROP_END_OF_LIST(),
> --
> 1.6.5