From nobody Sun Nov 2 11:47:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527671961956319.8618082391931; Wed, 30 May 2018 02:19:21 -0700 (PDT) Received: from localhost ([::1]:37137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNxGF-0003Ow-7V for importer@patchew.org; Wed, 30 May 2018 05:19:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNxE8-0002RT-7R for qemu-devel@nongnu.org; Wed, 30 May 2018 05:17:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNxE6-000715-B9 for qemu-devel@nongnu.org; Wed, 30 May 2018 05:17:04 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36286 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fNxE6-00070s-6d; Wed, 30 May 2018 05:17:02 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AED95400EB89; Wed, 30 May 2018 09:17:01 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-117-156.ams2.redhat.com [10.36.117.156]) by smtp.corp.redhat.com (Postfix) with ESMTP id 758F46B5A5; Wed, 30 May 2018 09:17:00 +0000 (UTC) From: Thomas Huth To: qemu-s390x@nongnu.org, Viktor Mihajlovski Date: Wed, 30 May 2018 11:16:56 +0200 Message-Id: <1527671818-23809-2-git-send-email-thuth@redhat.com> In-Reply-To: <1527671818-23809-1-git-send-email-thuth@redhat.com> References: <1527671818-23809-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 30 May 2018 09:17:01 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 30 May 2018 09:17:01 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 1/3] pc-bios/s390-ccw/net: Update code for the latest changes in SLOF X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Farhan Ali , Christian Borntraeger , Collin Walling , Cornelia Huck , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The ip_version information now has to be stored in the filename_ip_t structure, and there is now a common function called tftp_get_error_info() which can be used to get the error string for a TFTP error code. We can also get rid of some superfluous "(char *)" casts now. Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/netboot.mak | 2 +- pc-bios/s390-ccw/netmain.c | 85 +++++++++-------------------------------= ---- 2 files changed, 17 insertions(+), 70 deletions(-) diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak index 4f64128..a73be36 100644 --- a/pc-bios/s390-ccw/netboot.mak +++ b/pc-bios/s390-ccw/netboot.mak @@ -34,7 +34,7 @@ STDLIB_OBJS =3D atoi.o atol.o strtoul.o strtol.o rand.o m= alloc.o free.o %.o : $(SLOF_DIR)/lib/libc/stdlib/%.c $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)= $@") =20 -STDIO_OBJS =3D sprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \ +STDIO_OBJS =3D sprintf.o snprintf.o vfprintf.o vsnprintf.o vsprintf.o fpri= ntf.o \ printf.o putc.o puts.o putchar.o stdchnls.o fileno.o %.o : $(SLOF_DIR)/lib/libc/stdio/%.c $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)= $@") diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c index 6000241..7533cf7 100644 --- a/pc-bios/s390-ccw/netmain.c +++ b/pc-bios/s390-ccw/netmain.c @@ -47,7 +47,6 @@ IplParameterBlock iplb __attribute__((aligned(PAGE_SIZE))= ); static char cfgbuf[2048]; =20 static SubChannelId net_schid =3D { .one =3D 1 }; -static int ip_version =3D 4; static uint64_t dest_timer; =20 static uint64_t get_timer_ms(void) @@ -100,10 +99,10 @@ static int dhcp(struct filename_ip *fn_ip, int retries) printf("\nGiving up after %d DHCP requests\n", retries); return -1; } - ip_version =3D 4; + fn_ip->ip_version =3D 4; rc =3D dhcpv4(NULL, fn_ip); if (rc =3D=3D -1) { - ip_version =3D 6; + fn_ip->ip_version =3D 6; set_ipv6_address(fn_ip->fd, 0); rc =3D dhcpv6(NULL, fn_ip); if (rc =3D=3D 0) { @@ -137,8 +136,7 @@ static int tftp_load(filename_ip_t *fnip, void *buffer,= int len) tftp_err_t tftp_err; int rc; =20 - rc =3D tftp(fnip, buffer, len, DEFAULT_TFTP_RETRIES, &tftp_err, 1, 142= 8, - ip_version); + rc =3D tftp(fnip, buffer, len, DEFAULT_TFTP_RETRIES, &tftp_err); =20 if (rc < 0) { /* Make sure that error messages are put into a new line */ @@ -149,61 +147,10 @@ static int tftp_load(filename_ip_t *fnip, void *buffe= r, int len) printf(" TFTP: Received %s (%d KBytes)\n", fnip->filename, rc / 1= 024); } else if (rc > 0) { printf(" TFTP: Received %s (%d Bytes)\n", fnip->filename, rc); - } else if (rc =3D=3D -1) { - puts("unknown TFTP error"); - } else if (rc =3D=3D -2) { - printf("TFTP buffer of %d bytes is too small for %s\n", - len, fnip->filename); - } else if (rc =3D=3D -3) { - printf("file not found: %s\n", fnip->filename); - } else if (rc =3D=3D -4) { - puts("TFTP access violation"); - } else if (rc =3D=3D -5) { - puts("illegal TFTP operation"); - } else if (rc =3D=3D -6) { - puts("unknown TFTP transfer ID"); - } else if (rc =3D=3D -7) { - puts("no such TFTP user"); - } else if (rc =3D=3D -8) { - puts("TFTP blocksize negotiation failed"); - } else if (rc =3D=3D -9) { - puts("file exceeds maximum TFTP transfer size"); - } else if (rc <=3D -10 && rc >=3D -15) { - const char *icmp_err_str; - switch (rc) { - case -ICMP_NET_UNREACHABLE - 10: - icmp_err_str =3D "net unreachable"; - break; - case -ICMP_HOST_UNREACHABLE - 10: - icmp_err_str =3D "host unreachable"; - break; - case -ICMP_PROTOCOL_UNREACHABLE - 10: - icmp_err_str =3D "protocol unreachable"; - break; - case -ICMP_PORT_UNREACHABLE - 10: - icmp_err_str =3D "port unreachable"; - break; - case -ICMP_FRAGMENTATION_NEEDED - 10: - icmp_err_str =3D "fragmentation needed and DF set"; - break; - case -ICMP_SOURCE_ROUTE_FAILED - 10: - icmp_err_str =3D "source route failed"; - break; - default: - icmp_err_str =3D " UNKNOWN"; - break; - } - printf("ICMP ERROR \"%s\"\n", icmp_err_str); - } else if (rc =3D=3D -40) { - printf("TFTP error occurred after %d bad packets received", - tftp_err.bad_tftp_packets); - } else if (rc =3D=3D -41) { - printf("TFTP error occurred after missing %d responses", - tftp_err.no_packets); - } else if (rc =3D=3D -42) { - printf("TFTP error missing block %d, expected block was %d", - tftp_err.blocks_missed, - tftp_err.blocks_received); + } else { + const char *errstr =3D NULL; + tftp_get_error_info(fnip, &tftp_err, rc, &errstr, NULL); + printf("TFTP error: %s\n", errstr ? errstr : "unknown error"); } =20 return rc; @@ -231,7 +178,7 @@ static int net_init(filename_ip_t *fn_ip) =20 rc =3D dhcp(fn_ip, DEFAULT_BOOT_RETRIES); if (rc >=3D 0) { - if (ip_version =3D=3D 4) { + if (fn_ip->ip_version =3D=3D 4) { set_ipv4_address(fn_ip->own_ip); } } else { @@ -239,11 +186,11 @@ static int net_init(filename_ip_t *fn_ip) return -101; } =20 - if (ip_version =3D=3D 4) { + if (fn_ip->ip_version =3D=3D 4) { printf(" Using IPv4 address: %d.%d.%d.%d\n", (fn_ip->own_ip >> 24) & 0xFF, (fn_ip->own_ip >> 16) & 0xFF, (fn_ip->own_ip >> 8) & 0xFF, fn_ip->own_ip & 0xFF); - } else if (ip_version =3D=3D 6) { + } else if (fn_ip->ip_version =3D=3D 6) { char ip6_str[40]; ipv6_to_str(fn_ip->own_ip6.addr, ip6_str); printf(" Using IPv6 address: %s\n", ip6_str); @@ -261,17 +208,17 @@ static int net_init(filename_ip_t *fn_ip) } =20 printf(" Using TFTP server: "); - if (ip_version =3D=3D 4) { + if (fn_ip->ip_version =3D=3D 4) { printf("%d.%d.%d.%d\n", (fn_ip->server_ip >> 24) & 0xFF, (fn_ip->server_ip >> 16) &= 0xFF, (fn_ip->server_ip >> 8) & 0xFF, fn_ip->server_ip & 0xFF); - } else if (ip_version =3D=3D 6) { + } else if (fn_ip->ip_version =3D=3D 6) { char ip6_str[40]; ipv6_to_str(fn_ip->server_ip6.addr, ip6_str); printf("%s\n", ip6_str); } =20 - if (strlen((char *)fn_ip->filename) > 0) { + if (strlen(fn_ip->filename) > 0) { printf(" Bootfile name: '%s'\n", fn_ip->filename); } =20 @@ -280,7 +227,7 @@ static int net_init(filename_ip_t *fn_ip) =20 static void net_release(filename_ip_t *fn_ip) { - if (ip_version =3D=3D 4) { + if (fn_ip->ip_version =3D=3D 4) { dhcp_send_release(fn_ip->fd); } } @@ -322,7 +269,7 @@ static int handle_ins_cfg(filename_ip_t *fn_ip, char *c= fg, int cfgsize) return -1; } *ptr =3D 0; - strncpy((char *)fn_ip->filename, insbuf, sizeof(fn_ip->filename)); + strncpy(fn_ip->filename, insbuf, sizeof(fn_ip->filename)); destaddr =3D (char *)atol(ptr + 1); rc =3D tftp_load(fn_ip, destaddr, (long)_start - (long)destaddr); if (rc <=3D 0) { @@ -455,7 +402,7 @@ void main(void) panic("Network initialization failed. Halting.\n"); } =20 - fnlen =3D strlen((char *)fn_ip.filename); + fnlen =3D strlen(fn_ip.filename); if (fnlen > 0 && fn_ip.filename[fnlen - 1] !=3D '/') { rc =3D net_try_direct_tftp_load(&fn_ip); } --=20 1.8.3.1