| Message ID | 1360096768-8863-2-git-send-email-lersek@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Feb 05, 2013 at 09:39:14PM +0100, Laszlo Ersek wrote: > > Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > hw/qdev-monitor.c | 2 +- > vl.c | 8 ++++---- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c > index 4f9a6eb..56d66c3 100644 > --- a/hw/qdev-monitor.c > +++ b/hw/qdev-monitor.c > @@ -490,7 +490,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) > object_property_add_child(qdev_get_peripheral_anon(), name, > OBJECT(qdev), NULL); > g_free(name); > - } > + } > if (qdev_init(qdev) < 0) { > qerror_report(QERR_DEVICE_INIT_FAILED, driver); > return NULL; > diff --git a/vl.c b/vl.c > index a8dc73d..059e512 100644 > --- a/vl.c > +++ b/vl.c > @@ -2492,7 +2492,7 @@ static int virtcon_parse(const char *devname) > qemu_opt_set(bus_opts, "driver", "virtio-serial-s390"); > } else { > qemu_opt_set(bus_opts, "driver", "virtio-serial-pci"); > - } > + } > > dev_opts = qemu_opts_create_nofail(device); > qemu_opt_set(dev_opts, "driver", "virtconsole"); > @@ -2544,7 +2544,7 @@ static int sclp_parse(const char *devname) > } > > static int debugcon_parse(const char *devname) > -{ > +{ > QemuOpts *opts; > > if (!qemu_chr_new("debugcon", devname, NULL)) { > @@ -3654,8 +3654,8 @@ int main(int argc, char **argv, char **envp) > } > p += 8; > os_set_proc_name(p); > - } > - } > + } > + } > break; > case QEMU_OPTION_prom_env: > if (nb_prom_envs >= MAX_PROM_ENVS) { > -- > 1.7.1 > >
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index 4f9a6eb..56d66c3 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -490,7 +490,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) object_property_add_child(qdev_get_peripheral_anon(), name, OBJECT(qdev), NULL); g_free(name); - } + } if (qdev_init(qdev) < 0) { qerror_report(QERR_DEVICE_INIT_FAILED, driver); return NULL; diff --git a/vl.c b/vl.c index a8dc73d..059e512 100644 --- a/vl.c +++ b/vl.c @@ -2492,7 +2492,7 @@ static int virtcon_parse(const char *devname) qemu_opt_set(bus_opts, "driver", "virtio-serial-s390"); } else { qemu_opt_set(bus_opts, "driver", "virtio-serial-pci"); - } + } dev_opts = qemu_opts_create_nofail(device); qemu_opt_set(dev_opts, "driver", "virtconsole"); @@ -2544,7 +2544,7 @@ static int sclp_parse(const char *devname) } static int debugcon_parse(const char *devname) -{ +{ QemuOpts *opts; if (!qemu_chr_new("debugcon", devname, NULL)) { @@ -3654,8 +3654,8 @@ int main(int argc, char **argv, char **envp) } p += 8; os_set_proc_name(p); - } - } + } + } break; case QEMU_OPTION_prom_env: if (nb_prom_envs >= MAX_PROM_ENVS) {
Signed-off-by: Laszlo Ersek <lersek@redhat.com> --- hw/qdev-monitor.c | 2 +- vl.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)