RISC-V: Update syscall list for 32-bit support.

[qemu.git] / linux-user / uname.c

diff --git a/linux-user/uname.c b/linux-user/uname.c
index 1e6560d7242d705abb8d91828c4f128da27b20c4..a09ffe1ea7bdb9d5413b3edeb7628284e81a8841 100644 (file)
--- a/linux-user/uname.c
+++ b/linux-user/uname.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 

-#include <stdio.h>
+#include "qemu/osdep.h"

 
 #include "qemu.h"
 //#include "qemu-common.h"
 
 #include "qemu.h"
 //#include "qemu-common.h"


@@ -54,7 +54,7 @@ const char *cpu_to_uname_machine(void *cpu_env)
     return "armv5te" utsname_suffix;
 #elif defined(TARGET_I386) && !defined(TARGET_X86_64)
     /* see arch/x86/kernel/cpu/bugs.c: check_bugs(), 386, 486, 586, 686 */
     return "armv5te" utsname_suffix;
 #elif defined(TARGET_I386) && !defined(TARGET_X86_64)
     /* see arch/x86/kernel/cpu/bugs.c: check_bugs(), 386, 486, 586, 686 */

-    CPUState *cpu = ENV_GET_CPU((CPUX86State *)cpu_env);
+    CPUState *cpu = env_cpu((CPUX86State *)cpu_env);

     int family = object_property_get_int(OBJECT(cpu), "family", NULL);
     if (family == 4) {
         return "i486";
     int family = object_property_get_int(OBJECT(cpu), "family", NULL);
     if (family == 4) {
         return "i486";


@@ -72,9 +72,8 @@ const char *cpu_to_uname_machine(void *cpu_env)
 
 #define COPY_UTSNAME_FIELD(dest, src) \
   do { \
 
 #define COPY_UTSNAME_FIELD(dest, src) \
   do { \

-      /* __NEW_UTS_LEN doesn't include terminating null */ \
-      (void) strncpy((dest), (src), __NEW_UTS_LEN); \
-      (dest)[__NEW_UTS_LEN] = '\0'; \
+      memcpy((dest), (src), MIN(sizeof(src), sizeof(dest))); \
+      (dest)[sizeof(dest) - 1] = '\0'; \

   } while (0)
 
 int sys_uname(struct new_utsname *buf)
   } while (0)
 
 int sys_uname(struct new_utsname *buf)