From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LKwAu-0007Yx-NO for qemu-devel@nongnu.org; Thu, 08 Jan 2009 09:47:56 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LKwAs-0007Xs-SI for qemu-devel@nongnu.org; Thu, 08 Jan 2009 09:47:56 -0500 Received: from [199.232.76.173] (port=39471 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LKwAs-0007Xl-4e for qemu-devel@nongnu.org; Thu, 08 Jan 2009 09:47:54 -0500 Received: from mail27.svc.cra.dublin.eircom.net ([159.134.118.223]:33646) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1LKwAr-0007of-Oy for qemu-devel@nongnu.org; Thu, 08 Jan 2009 09:47:53 -0500 From: Mark McLoughlin Date: Thu, 8 Jan 2009 14:47:46 +0000 Message-Id: <1231426069-28321-1-git-send-email-markmc@redhat.com> In-Reply-To: <1231425939.4296.79.camel@localhost.localdomain> References: <1231425939.4296.79.camel@localhost.localdomain> Subject: [Qemu-devel] [PATCH 1/4] Add qemu_check_nic_model() and qemu_check_nic_model_list() Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, Mark McLoughlin Signed-off-by: Mark McLoughlin --- net.c | 34 ++++++++++++++++++++++++++++++++++ net.h | 3 +++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/net.c b/net.c index 15f9153..4609be2 100644 --- a/net.c +++ b/net.c @@ -1491,6 +1491,40 @@ VLANState *qemu_find_vlan(int id) return vlan; } +void qemu_check_nic_model(NICInfo *nd, const char *model) +{ + const char *models[2]; + + models[0] = model; + models[1] = NULL; + + qemu_check_nic_model_list(nd, models, model); +} + +void qemu_check_nic_model_list(NICInfo *nd, const char * const *models, + const char *default_model) +{ + int i, exit_status = 0; + + 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; + + fprintf(stderr, "qemu: Unsupported NIC model: %s\n", nd->model); + exit_status = 1; + } + + 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); +} + int net_client_init(const char *device, const char *p) { char buf[1024]; diff --git a/net.h b/net.h index b89d165..19ab649 100644 --- a/net.h +++ b/net.h @@ -43,6 +43,9 @@ ssize_t qemu_sendv_packet(VLANClientState *vc, const struct iovec *iov, int iovcnt); void qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size); void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6]); +void qemu_check_nic_model(NICInfo *nd, const char *model); +void qemu_check_nic_model_list(NICInfo *nd, const char * const *models, + const char *default_model); void qemu_handler_true(void *opaque); void do_info_network(void); -- 1.6.0.6