From e084d4f0f1202f82db360c03c068433144d308b8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 18 Sep 2009 16:32:58 +0100 Subject: [PATCH] pxe: Don't look for PXE ROMs when running as a DM Searching for PXE ROMs in attached NICs is unnecessary as the ROM that is used is included in the hvmloader binary. In the case where there are only pass-through NICs it will cause the boot to fail as the NICs are not known to qemu-xen at the time that this check is made. In other words, without this change PXE boot from a pass-through device will fail. This has likely been broken since I changed around the pass-through code so that devices passed-through at boot-time are handled by hot-plug. Signed-off-by: Simon Horman --- vl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vl.c b/vl.c index 06d966261..4a331f85a 100644 --- a/vl.c +++ b/vl.c @@ -5627,6 +5627,7 @@ int main(int argc, char **argv, char **envp) } net_client_check(); +#ifndef CONFIG_DM #ifdef TARGET_I386 /* XXX: this should be moved in the PC machine instantiation code */ if (net_boot != 0) { @@ -5654,6 +5655,7 @@ int main(int argc, char **argv, char **envp) exit(1); } } +#endif #endif /* init the bluetooth world */ -- 2.39.5