diff --git a/Config.mk b/Config.mk index 8269503f73..db434ee2c6 100644 --- a/Config.mk +++ b/Config.mk @@ -246,7 +246,7 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= a3741780fe3535e19e02efa869a7cac481891129 QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= master +MINIOS_UPSTREAM_REVISION ?= 0b4b7897e08b967a09bed2028a79fabff82342dd SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0 diff --git a/stubdom/grub/mini-os.c b/stubdom/grub/mini-os.c index b33dbf02fb..4fc052a255 100644 --- a/stubdom/grub/mini-os.c +++ b/stubdom/grub/mini-os.c @@ -291,6 +291,8 @@ struct netfront_dev *net_dev; int minios_probe (struct nic *nic) { + char *ip; + if (net_dev) return 1; @@ -298,7 +300,7 @@ minios_probe (struct nic *nic) grub_memset ((char *) arptable, 0, MAX_ARP * sizeof (struct arptable_t)); - net_dev = init_netfront(NULL, (void*) -1, nic->node_addr, NULL, NULL, NULL); + net_dev = init_netfront(NULL, (void*) -1, nic->node_addr, &ip); if (!net_dev) return 0;