diff options
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 27 |
1 files changed, 16 insertions, 11 deletions
@@ -3429,8 +3429,7 @@ static CharDriverState *qemu_chr_open_tcp(const char *host_str, #ifndef _WIN32 if (is_unix) { char path[109]; - strncpy(path, uaddr.sun_path, 108); - path[108] = 0; + pstrcpy(path, sizeof(path), uaddr.sun_path); unlink(path); } else #endif @@ -5291,7 +5290,7 @@ int drive_init(struct drive_opt *arg, int snapshot, } if (get_param_value(buf, sizeof(buf), "if", str)) { - strncpy(devname, buf, sizeof(devname)); + pstrcpy(devname, sizeof(devname), buf); if (!strcmp(buf, "ide")) { type = IF_IDE; max_devs = MAX_IDE_DEVS; @@ -6340,6 +6339,10 @@ static int qemu_savevm_state(QEMUFile *f) qemu_put_be64(f, 0); /* total size */ for(se = first_se; se != NULL; se = se->next) { + if (se->save_state == NULL) + /* this one has a loader only, for backwards compatibility */ + continue; + /* ID string */ len = strlen(se->idstr); qemu_put_byte(f, len); @@ -7406,14 +7409,6 @@ void qemu_system_powerdown_request(void) cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT); } -/* boot_set handler */ -QEMUBootSetHandler *qemu_boot_set_handler = NULL; - -void qemu_register_boot_set(QEMUBootSetHandler *func) -{ - qemu_boot_set_handler = func; -} - static int qemu_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *xfds, struct timeval *tv) { @@ -8121,6 +8116,16 @@ struct soundhw soundhw[] = { { .init_isa = SB16_init } }, +#ifdef CONFIG_CS4231A + { + "cs4231a", + "CS4231A", + 0, + 1, + { .init_isa = cs4231a_init } + }, +#endif + #ifdef CONFIG_ADLIB { "adlib", |