2 files changed, 4 insertions, 4 deletions
diff --git a/hw/acpi.c b/hw/acpi.c
index 52bc43ad58..52f50a0814 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -841,7 +841,7 @@ int acpi_table_add(const char *t)
     f = buf;
     while (buf[0]) {
         struct stat s;
-        char *n = index(f, ':');
+        char *n = strchr(f, ':');
         if (n)
             *n = '\0';
         if(stat(f, &s) < 0) {
@@ -873,7 +873,7 @@ int acpi_table_add(const char *t)
     while (buf[0]) {
         struct stat s;
         int fd;
-        char *n = index(f, ':');
+        char *n = strchr(f, ':');
         if (n)
             *n = '\0';
         fd = open(f, O_RDONLY);
diff --git a/vl.c b/vl.c
index 8e59cd8d74..1d96a313db 100644
--- a/vl.c
+++ b/vl.c
@@ -4641,8 +4641,8 @@ int main(int argc, char **argv, char **envp)
     const char *pid_file = NULL;
     int autostart;
     const char *incoming = NULL;
-    int fd;
-    struct passwd *pwd;
+    int fd = 0;
+    struct passwd *pwd = NULL;
     const char *chroot_dir = NULL;
     const char *run_as = NULL;