Message ID | 1305805037-17752-4-git-send-email-armbru@redhat.com |
---|---|
State | New |
Headers | show |
On (Thu) 19 May 2011 [13:37:16], Markus Armbruster wrote: > diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c > index bd3121e..a7d6b2b 100644 > --- a/hw/virtio-serial-bus.c > +++ b/hw/virtio-serial-bus.c > @@ -642,6 +642,11 @@ static struct BusInfo virtser_bus_info = { > .name = "virtio-serial-bus", > .size = sizeof(VirtIOSerialBus), > .print_dev = virtser_bus_dev_print, > + .props = (Property[]) { > + DEFINE_PROP_UINT32("nr", VirtIOSerialPort, id, VIRTIO_CONSOLE_BAD_ID), > + DEFINE_PROP_STRING("name", VirtIOSerialPort, name), > + DEFINE_PROP_END_OF_LIST() > + } 'name' isn't a must-have for all devices, but this is change OK. Amit
Amit Shah <amit.shah@redhat.com> writes: > On (Thu) 19 May 2011 [13:37:16], Markus Armbruster wrote: >> diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c >> index bd3121e..a7d6b2b 100644 >> --- a/hw/virtio-serial-bus.c >> +++ b/hw/virtio-serial-bus.c >> @@ -642,6 +642,11 @@ static struct BusInfo virtser_bus_info = { >> .name = "virtio-serial-bus", >> .size = sizeof(VirtIOSerialBus), >> .print_dev = virtser_bus_dev_print, >> + .props = (Property[]) { >> + DEFINE_PROP_UINT32("nr", VirtIOSerialPort, id, VIRTIO_CONSOLE_BAD_ID), >> + DEFINE_PROP_STRING("name", VirtIOSerialPort, name), >> + DEFINE_PROP_END_OF_LIST() >> + } > > 'name' isn't a must-have for all devices, but this is change OK. The property is a must have, even though its value may remain null. Correct?
On (Thu) 19 May 2011 [16:05:39], Markus Armbruster wrote: > Amit Shah <amit.shah@redhat.com> writes: > > > On (Thu) 19 May 2011 [13:37:16], Markus Armbruster wrote: > >> diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c > >> index bd3121e..a7d6b2b 100644 > >> --- a/hw/virtio-serial-bus.c > >> +++ b/hw/virtio-serial-bus.c > >> @@ -642,6 +642,11 @@ static struct BusInfo virtser_bus_info = { > >> .name = "virtio-serial-bus", > >> .size = sizeof(VirtIOSerialBus), > >> .print_dev = virtser_bus_dev_print, > >> + .props = (Property[]) { > >> + DEFINE_PROP_UINT32("nr", VirtIOSerialPort, id, VIRTIO_CONSOLE_BAD_ID), > >> + DEFINE_PROP_STRING("name", VirtIOSerialPort, name), > >> + DEFINE_PROP_END_OF_LIST() > >> + } > > > > 'name' isn't a must-have for all devices, but this is change OK. > > The property is a must have, even though its value may remain null. > Correct? Ah; must have for the device (ie qdev purposes)? Yes. It's not a must-have for guest-host communication, that's what I meant. Amit
diff --git a/hw/virtio-console.c b/hw/virtio-console.c index de539c4..9185140 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -117,9 +117,7 @@ static VirtIOSerialPortInfo virtconsole_info = { .exit = virtconsole_exitfn, .qdev.props = (Property[]) { DEFINE_PROP_UINT8("is_console", VirtConsole, port.is_console, 1), - DEFINE_PROP_UINT32("nr", VirtConsole, port.id, VIRTIO_CONSOLE_BAD_ID), DEFINE_PROP_CHR("chardev", VirtConsole, chr), - DEFINE_PROP_STRING("name", VirtConsole, port.name), DEFINE_PROP_END_OF_LIST(), }, }; @@ -152,9 +150,7 @@ static VirtIOSerialPortInfo virtserialport_info = { .init = virtserialport_initfn, .exit = virtconsole_exitfn, .qdev.props = (Property[]) { - DEFINE_PROP_UINT32("nr", VirtConsole, port.id, VIRTIO_CONSOLE_BAD_ID), DEFINE_PROP_CHR("chardev", VirtConsole, chr), - DEFINE_PROP_STRING("name", VirtConsole, port.name), DEFINE_PROP_END_OF_LIST(), }, }; diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index bd3121e..a7d6b2b 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -642,6 +642,11 @@ static struct BusInfo virtser_bus_info = { .name = "virtio-serial-bus", .size = sizeof(VirtIOSerialBus), .print_dev = virtser_bus_dev_print, + .props = (Property[]) { + DEFINE_PROP_UINT32("nr", VirtIOSerialPort, id, VIRTIO_CONSOLE_BAD_ID), + DEFINE_PROP_STRING("name", VirtIOSerialPort, name), + DEFINE_PROP_END_OF_LIST() + } }; static VirtIOSerialBus *virtser_bus_new(DeviceState *dev)
Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/virtio-console.c | 4 ---- hw/virtio-serial-bus.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-)