[libvirt] [PATCH] qemu: Fix grouping of capabilities strings
Commit f8d478b6dfc46a0ad2459844b96937599dec06e1 broke the grouping by five items. --- Pushed under the trivial rule. --- src/qemu/qemu_capabilities.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 25e8951..b166dd6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -200,7 +200,8 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "vmware-svga", "device-video-primary", "s390-sclp", - "usb-serial", + + "usb-serial", /* 125 */ "usb-net", ); -- 1.8.1
On 01/11/2013 11:47 AM, Peter Krempa wrote:
Commit f8d478b6dfc46a0ad2459844b96937599dec06e1 broke the grouping by five items. --- Pushed under the trivial rule. --- src/qemu/qemu_capabilities.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 25e8951..b166dd6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -200,7 +200,8 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "vmware-svga", "device-video-primary", "s390-sclp", - "usb-serial", + + "usb-serial", /* 125 */ "usb-net",
Wait. I thought we weren't going to use "usb-net" for this last device, and that it instead should be named based on the type of hardware it was emulating, and the fact that it was usb would be derived from the guest-side address element. Did I miss a different message where something else was decided?
On Fri, Jan 11, 2013 at 03:20:39PM -0500, Laine Stump wrote:
On 01/11/2013 11:47 AM, Peter Krempa wrote:
Commit f8d478b6dfc46a0ad2459844b96937599dec06e1 broke the grouping by five items. --- Pushed under the trivial rule. --- src/qemu/qemu_capabilities.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 25e8951..b166dd6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -200,7 +200,8 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "vmware-svga", "device-video-primary", "s390-sclp", - "usb-serial", + + "usb-serial", /* 125 */ "usb-net",
Wait. I thought we weren't going to use "usb-net" for this last device, and that it instead should be named based on the type of hardware it was emulating, and the fact that it was usb would be derived from the guest-side address element. Did I miss a different message where something else was decided?
Don't worry - this is different code. This is the list of QEMU device names we have to probe. That is separate from what we call it in the XML. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
participants (3)
-
Daniel P. Berrange -
Laine Stump -
Peter Krempa