[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCHv3 11/14] Add bootindex parameter to net/block/fd
From: |
Blue Swirl |
Subject: |
[Qemu-devel] Re: [PATCHv3 11/14] Add bootindex parameter to net/block/fd device |
Date: |
Wed, 10 Nov 2010 18:32:54 +0000 |
On Wed, Nov 10, 2010 at 5:14 PM, Gleb Natapov <address@hidden> wrote:
> If bootindex is specified on command line a string that describes device
> in firmware readable way is added into sorted list. Later this list will
> be passed into firmware to control boot order.
>
> Signed-off-by: Gleb Natapov <address@hidden>
> ---
> block_int.h | 4 +++-
> hw/e1000.c | 7 +++++++
> hw/eepro100.c | 6 ++++++
> hw/fdc.c | 13 +++++++++++++
> hw/ide/qdev.c | 7 +++++++
> hw/ne2000.c | 6 ++++++
> hw/pcnet.c | 6 ++++++
> hw/qdev.c | 32 ++++++++++++++++++++++++++++++++
> hw/qdev.h | 1 +
> hw/rtl8139.c | 7 +++++++
> hw/usb-net.c | 4 ++++
> hw/virtio-blk.c | 4 ++++
> hw/virtio-net.c | 4 ++++
> net.h | 4 +++-
> sysemu.h | 2 ++
> vl.c | 35 +++++++++++++++++++++++++++++++++++
> 16 files changed, 140 insertions(+), 2 deletions(-)
>
> diff --git a/block_int.h b/block_int.h
> index 87e60b8..f9042a8 100644
> --- a/block_int.h
> +++ b/block_int.h
> @@ -227,6 +227,7 @@ typedef struct BlockConf {
> uint16_t logical_block_size;
> uint16_t min_io_size;
> uint32_t opt_io_size;
> + int32_t bootindex;
> } BlockConf;
>
> static inline unsigned int get_physical_block_exp(BlockConf *conf)
> @@ -249,6 +250,7 @@ static inline unsigned int
> get_physical_block_exp(BlockConf *conf)
> DEFINE_PROP_UINT16("physical_block_size", _state, \
> _conf.physical_block_size, 512), \
> DEFINE_PROP_UINT16("min_io_size", _state, _conf.min_io_size, 0), \
> - DEFINE_PROP_UINT32("opt_io_size", _state, _conf.opt_io_size, 0)
> + DEFINE_PROP_UINT32("opt_io_size", _state, _conf.opt_io_size, 0), \
> + DEFINE_PROP_INT32("bootindex", _state, _conf.bootindex, -1) \
>
> #endif /* BLOCK_INT_H */
> diff --git a/hw/e1000.c b/hw/e1000.c
> index 532efdc..009e24b 100644
> --- a/hw/e1000.c
> +++ b/hw/e1000.c
> @@ -30,6 +30,7 @@
> #include "net.h"
> #include "net/checksum.h"
> #include "loader.h"
> +#include "sysemu.h"
>
> #include "e1000_hw.h"
>
> @@ -1148,6 +1149,12 @@ static int pci_e1000_init(PCIDevice *pci_dev)
> d->dev.qdev.info->name, d->dev.qdev.id, d);
>
> qemu_format_nic_info_str(&d->nic->nc, macaddr);
> +
> + if (d->conf.bootindex >= 0) {
Maybe these checks should be moved into add_boot_device_path, that
would simplify the callers.
- [Qemu-devel] [PATCHv3 09/14] Record which USBDevice USBPort belongs too., (continued)
[Qemu-devel] [PATCHv3 13/14] Add notifier that will be called when machine is fully created., Gleb Natapov, 2010/11/10
[Qemu-devel] [PATCHv3 11/14] Add bootindex parameter to net/block/fd device, Gleb Natapov, 2010/11/10
- [Qemu-devel] Re: [PATCHv3 11/14] Add bootindex parameter to net/block/fd device,
Blue Swirl <=
[Qemu-devel] Re: [PATCHv3 00/14] boot order specification, Blue Swirl, 2010/11/10
[Qemu-devel] Re: [PATCHv3 00/14] boot order specification, Gerd Hoffmann, 2010/11/11