From patchwork Fri Sep 25 01:53:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 34248 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 36787B7B8D for ; Fri, 25 Sep 2009 11:59:02 +1000 (EST) Received: from localhost ([127.0.0.1]:56322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mr05L-000573-9U for incoming@patchwork.ozlabs.org; Thu, 24 Sep 2009 21:58:59 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mr00Y-00041B-MT for qemu-devel@nongnu.org; Thu, 24 Sep 2009 21:54:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mr00T-000407-Vd for qemu-devel@nongnu.org; Thu, 24 Sep 2009 21:54:02 -0400 Received: from [199.232.76.173] (port=39178 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mr00T-000404-QA for qemu-devel@nongnu.org; Thu, 24 Sep 2009 21:53:57 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:39226) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mr00T-0000a7-0m for qemu-devel@nongnu.org; Thu, 24 Sep 2009 21:53:57 -0400 Received: from pike.pond.sub.org (pD9E39B51.dip.t-dialin.net [217.227.155.81]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 2A449276D1B for ; Fri, 25 Sep 2009 03:53:53 +0200 (CEST) Received: by pike.pond.sub.org (Postfix, from userid 1000) id 632D2100A1; Fri, 25 Sep 2009 03:53:53 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 25 Sep 2009 03:53:51 +0200 Message-Id: X-Mailer: git-send-email 1.6.0.6 In-Reply-To: References: X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH 4/6] Fix pci_add nic not to exit on bad model X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Monitor command "pci_add ADDR nic model=MODEL" uses pci_nic_init() to create the NIC. When MODEL is unknown or "?", this prints to stderr and terminates the program. Change pci_nic_init() not to treat "?" specially, and to return NULL on failure. Switch uses during startup to new convenience wrapper pci_nic_init_nofail(), which behaves just like pci_nic_init() used to do. Bonus bug fix: we now check for qdev_init() failing there. Signed-off-by: Markus Armbruster --- hw/mips_malta.c | 2 +- hw/pc.c | 2 +- hw/pci.c | 33 ++++++++++++++++++++++++++++++--- hw/pci.h | 2 ++ hw/ppc440_bamboo.c | 2 +- hw/ppc_newworld.c | 2 +- hw/ppc_oldworld.c | 2 +- hw/ppc_prep.c | 2 +- hw/ppce500_mpc8544ds.c | 2 +- hw/r2d.c | 2 +- hw/realview.c | 2 +- hw/sun4u.c | 2 +- hw/versatilepb.c | 2 +- net.c | 41 +++++++++++++++++++++++++---------------- net.h | 5 +++-- 15 files changed, 71 insertions(+), 32 deletions(-) diff --git a/hw/mips_malta.c b/hw/mips_malta.c index e09e971..2137034 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -489,7 +489,7 @@ static void network_init(void) /* The malta board has a PCNet card using PCI SLOT 11 */ default_devaddr = "0b"; - pci_nic_init(nd, "pcnet", default_devaddr); + pci_nic_init_nofail(nd, "pcnet", default_devaddr); } } diff --git a/hw/pc.c b/hw/pc.c index bc2875e..ac56495 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1351,7 +1351,7 @@ static void pc_init1(ram_addr_t ram_size, if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0)) pc_init_ne2k_isa(nd); else - pci_nic_init(nd, "e1000", NULL); + pci_nic_init_nofail(nd, "e1000", NULL); } piix4_acpi_system_hot_add_init(); diff --git a/hw/pci.c b/hw/pci.c index 92262f7..e43b53e 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -811,21 +811,48 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, const char *default_devaddr) { const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr; + PCIBus *bus; + int devfn; PCIDevice *pci_dev; DeviceState *dev; int i; - i = qemu_check_nic_model_list(nd, pci_nic_models, default_model); - pci_dev = pci_create(pci_nic_names[i], devaddr); + i = qemu_find_nic_model(nd, pci_nic_models, default_model); + if (i < 0) + return NULL; + + bus = pci_get_bus_devfn(&devfn, devaddr); + if (!bus) { + qemu_error("Invalid PCI device address %s for device %s\n", + devaddr, pci_nic_names[i]); + return NULL; + } + + pci_dev = pci_create_noinit(bus, devfn, pci_nic_names[i]); dev = &pci_dev->qdev; if (nd->id) dev->id = qemu_strdup(nd->id); dev->nd = nd; - qdev_init(dev); + if (qdev_init(dev) < 0) + return NULL; nd->private = dev; return pci_dev; } +PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model, + const char *default_devaddr) +{ + PCIDevice *res; + + if (qemu_show_nic_models(nd->model, pci_nic_models)) + exit(0); + + res = pci_nic_init(nd, default_model, default_devaddr); + if (!res) + exit(1); + return res; +} + typedef struct { PCIDevice dev; PCIBus *bus; diff --git a/hw/pci.h b/hw/pci.h index 356405e..51c5085 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -254,6 +254,8 @@ PCIBus *pci_register_bus(DeviceState *parent, const char *name, PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, const char *default_devaddr); +PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model, + const char *default_devaddr); void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len); uint32_t pci_data_read(void *opaque, uint32_t addr, int len); int pci_bus_num(PCIBus *s); diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index 8a6b7ce..a488240 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -119,7 +119,7 @@ static void bamboo_init(ram_addr_t ram_size, for (i = 0; i < nb_nics; i++) { /* There are no PCI NICs on the Bamboo board, but there are * PCI slots, so we can pick whatever default model we want. */ - pci_nic_init(&nd_table[i], "e1000", NULL); + pci_nic_init_nofail(&nd_table[i], "e1000", NULL); } } diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 6bd5234..d1a82bf 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -320,7 +320,7 @@ static void ppc_core99_init (ram_addr_t ram_size, serial_hds[0], serial_hds[1], ESCC_CLOCK, 4); for(i = 0; i < nb_nics; i++) - pci_nic_init(&nd_table[i], "ne2k_pci", NULL); + pci_nic_init_nofail(&nd_table[i], "ne2k_pci", NULL); if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) { fprintf(stderr, "qemu: too many IDE bus\n"); diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index bb8c969..79f17e8 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -333,7 +333,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, serial_hds[1], ESCC_CLOCK, 4); for(i = 0; i < nb_nics; i++) - pci_nic_init(&nd_table[i], "ne2k_pci", NULL); + pci_nic_init_nofail(&nd_table[i], "ne2k_pci", NULL); if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) { diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 0525b1e..a94cdde 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -697,7 +697,7 @@ static void ppc_prep_init (ram_addr_t ram_size, if (strcmp(nd_table[i].model, "ne2k_isa") == 0) { isa_ne2000_init(ne2000_io[i], ne2000_irq[i], &nd_table[i]); } else { - pci_nic_init(&nd_table[i], "ne2k_pci", NULL); + pci_nic_init_nofail(&nd_table[i], "ne2k_pci", NULL); } } diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index 5044194..ea30816 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -219,7 +219,7 @@ static void mpc8544ds_init(ram_addr_t ram_size, if (pci_bus) { /* Register network interfaces. */ for (i = 0; i < nb_nics; i++) { - pci_nic_init(&nd_table[i], "virtio", NULL); + pci_nic_init_nofail(&nd_table[i], "virtio", NULL); } } diff --git a/hw/r2d.c b/hw/r2d.c index ea19ff6..f8a5968 100644 --- a/hw/r2d.c +++ b/hw/r2d.c @@ -236,7 +236,7 @@ static void r2d_init(ram_addr_t ram_size, /* NIC: rtl8139 on-board, and 2 slots. */ for (i = 0; i < nb_nics; i++) - pci_nic_init(&nd_table[i], "rtl8139", i==0 ? "2" : NULL); + pci_nic_init_nofail(&nd_table[i], "rtl8139", i==0 ? "2" : NULL); /* Todo: register on board registers */ if (kernel_filename) { diff --git a/hw/realview.c b/hw/realview.c index a18e773..c494a20 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -125,7 +125,7 @@ static void realview_init(ram_addr_t ram_size, smc91c111_init(nd, 0x4e000000, pic[28]); done_smc = 1; } else { - pci_nic_init(nd, "rtl8139", NULL); + pci_nic_init_nofail(nd, "rtl8139", NULL); } } diff --git a/hw/sun4u.c b/hw/sun4u.c index 2c97d9d..333092f 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -616,7 +616,7 @@ static void sun4uv_init(ram_addr_t RAM_size, } for(i = 0; i < nb_nics; i++) - pci_nic_init(&nd_table[i], "ne2k_pci", NULL); + pci_nic_init_nofail(&nd_table[i], "ne2k_pci", NULL); if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) { fprintf(stderr, "qemu: too many IDE bus\n"); diff --git a/hw/versatilepb.c b/hw/versatilepb.c index 29b85ae..e8ebdf1 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -213,7 +213,7 @@ static void versatile_init(ram_addr_t ram_size, smc91c111_init(nd, 0x10010000, sic[25]); done_smc = 1; } else { - pci_nic_init(nd, "rtl8139", NULL); + pci_nic_init_nofail(nd, "rtl8139", NULL); } } if (usb_enabled) { diff --git a/net.c b/net.c index 0eba08b..2d5899f 100644 --- a/net.c +++ b/net.c @@ -2348,6 +2348,19 @@ static int nic_get_free_idx(void) return -1; } +int qemu_show_nic_models(const char *arg, const char *const *models) +{ + int i; + + if (!arg || strcmp(arg, "?")) + return 0; + + fprintf(stderr, "qemu: Supported NIC models: "); + for (i = 0 ; models[i]; i++) + fprintf(stderr, "%s%c", models[i], models[i+1] ? ',' : '\n'); + return 1; +} + void qemu_check_nic_model(NICInfo *nd, const char *model) { const char *models[2]; @@ -2355,31 +2368,27 @@ void qemu_check_nic_model(NICInfo *nd, const char *model) models[0] = model; models[1] = NULL; - qemu_check_nic_model_list(nd, models, model); + if (qemu_show_nic_models(nd->model, models)) + exit(0); + if (qemu_find_nic_model(nd, models, model) < 0) + exit(1); } -int qemu_check_nic_model_list(NICInfo *nd, const char * const *models, - const char *default_model) +int qemu_find_nic_model(NICInfo *nd, const char * const *models, + const char *default_model) { - int i, exit_status = 0; + int i; if (!nd->model) nd->model = strdup(default_model); - if (strcmp(nd->model, "?") != 0) { - for (i = 0 ; models[i]; i++) - if (strcmp(nd->model, models[i]) == 0) - return i; - - fprintf(stderr, "qemu: Unsupported NIC model: %s\n", nd->model); - exit_status = 1; + for (i = 0 ; models[i]; i++) { + if (strcmp(nd->model, models[i]) == 0) + return i; } - fprintf(stderr, "qemu: Supported NIC models: "); - for (i = 0 ; models[i]; i++) - fprintf(stderr, "%s%c", models[i], models[i+1] ? ',' : '\n'); - - exit(exit_status); + qemu_error("qemu: Unsupported NIC model: %s\n", nd->model); + return -1; } static int net_handle_fd_param(Monitor *mon, const char *param) diff --git a/net.h b/net.h index c93cc99..dfce8d6 100644 --- a/net.h +++ b/net.h @@ -75,9 +75,10 @@ ssize_t qemu_send_packet_async(VLANClientState *vc, const uint8_t *buf, void qemu_purge_queued_packets(VLANClientState *vc); void qemu_flush_queued_packets(VLANClientState *vc); void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6]); +int qemu_show_nic_models(const char *arg, const char *const *models); void qemu_check_nic_model(NICInfo *nd, const char *model); -int qemu_check_nic_model_list(NICInfo *nd, const char * const *models, - const char *default_model); +int qemu_find_nic_model(NICInfo *nd, const char * const *models, + const char *default_model); void qemu_handler_true(void *opaque); void do_info_network(Monitor *mon);