Gerd Hoffmann <kra...@redhat.com> writes:
> Switch over parallel ports to the new default device system.
>
> Disable default parallel port for both '-parallel' and '-device
> isa-parallel' cases.
This feels a bit terse to me. What about a suitably edited copy of
PATCH 2/9's message?
>
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
> ---
> vl.c | 68
> +++++++++++++++++++++++++++++++++---------------------------------
> 1 files changed, 34 insertions(+), 34 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 967d499..739c3a7 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -271,12 +271,14 @@ static QEMUBootSetHandler *boot_set_handler;
> static void *boot_set_opaque;
>
> static int default_serial = 1;
> +static int default_parallel = 1;
>
> static struct {
> const char *driver;
> int *flag;
> } default_list[] = {
> - { .driver = "isa-serial", .flag = &default_serial }
> + { .driver = "isa-serial", .flag = &default_serial },
> + { .driver = "isa-parallel", .flag = &default_parallel },
> };
>
> static int default_driver_check(QemuOpts *opts, void *opaque)
> @@ -4568,6 +4570,7 @@ struct device_config {
> DEV_USB, /* -usbdevice */
> DEV_BT, /* -bt */
> DEV_SERIAL, /* -serial */
> + DEV_PARALLEL, /* -parallel */
> } type;
> const char *cmdline;
> QTAILQ_ENTRY(device_config) next;
> @@ -4643,6 +4646,28 @@ static int serial_parse(const char *devname)
> return 0;
> }
>
> +static int parallel_parse(const char *devname)
> +{
> + static int index = 0;
> + char label[32];
> +
> + if (strcmp(devname, "none") == 0)
> + return 0;
> + snprintf(label, sizeof(label), "parallel%d", index);
> + parallel_hds[index] = qemu_chr_open(label, devname, NULL);
Like for serial_parse(): don't you have to catch index >=
MAX_PARALLEL_PORTS here?
> + if (!parallel_hds[index]) {
> + fprintf(stderr, "qemu: could not open parallel device '%s': %s\n",
> + devname, strerror(errno));
> + return -1;
> + }
> + if (strstart(devname, "vc", 0)) {
> + snprintf(label, sizeof(label), "parallel%d console\r\n", index);
> + parallel_hds[index]->greeting = qemu_strdup(label);
> + }
> + index++;
> + return 0;
> +}
> +
> int main(int argc, char **argv, char **envp)
> {
> const char *gdbstub_dev = NULL;
> @@ -4661,8 +4686,6 @@ int main(int argc, char **argv, char **envp)
[...]
