diff mbox

[1/3] qdev-monitor: sort alias table by typename

Message ID 1455023713-104799-2-git-send-email-silbe@linux.vnet.ibm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sascha Silbe Feb. 9, 2016, 1:15 p.m. UTC
Sort the alias table by typename so it's easier to see which aliases
exist.

Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
---
 qdev-monitor.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Halil Pasic Feb. 10, 2016, 10:20 a.m. UTC | #1
On 02/09/2016 02:15 PM, Sascha Silbe wrote:
> Sort the alias table by typename so it's easier to see which aliases
> exist.
> 
> Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
> ---
>  qdev-monitor.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/qdev-monitor.c b/qdev-monitor.c
> index 81e3ff3..0145deb 100644
> --- a/qdev-monitor.c
> +++ b/qdev-monitor.c
> @@ -40,18 +40,18 @@ typedef struct QDevAlias
>  } QDevAlias;
> 
>  static const QDevAlias qdev_alias_table[] = {
> -    { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
> -    { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
> -    { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
> +    { "e1000", "e1000-82540em" },
> +    { "ich9-ahci", "ahci" },
> +    { "kvm-pci-assign", "pci-assign" },
> +    { "lsi53c895a", "lsi" },
>      { "virtio-balloon-pci", "virtio-balloon",
>              QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
>      { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_S390X },
> +    { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
>      { "virtio-net-ccw", "virtio-net", QEMU_ARCH_S390X },
> +    { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
>      { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_S390X },
> -    { "lsi53c895a", "lsi" },
> -    { "ich9-ahci", "ahci" },
> -    { "kvm-pci-assign", "pci-assign" },
> -    { "e1000", "e1000-82540em" },
> +    { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
>      { }
>  };
> 
Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Markus Armbruster Feb. 11, 2016, 8:53 a.m. UTC | #2
Sascha Silbe <silbe@linux.vnet.ibm.com> writes:

> Sort the alias table by typename so it's easier to see which aliases
> exist.
>
> Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
> ---
>  qdev-monitor.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/qdev-monitor.c b/qdev-monitor.c
> index 81e3ff3..0145deb 100644
> --- a/qdev-monitor.c
> +++ b/qdev-monitor.c
> @@ -40,18 +40,18 @@ typedef struct QDevAlias
>  } QDevAlias;
>  
>  static const QDevAlias qdev_alias_table[] = {

Suggest to add

       /* Please keep this table sorted */

> -    { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
> -    { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
> -    { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
> +    { "e1000", "e1000-82540em" },
> +    { "ich9-ahci", "ahci" },
> +    { "kvm-pci-assign", "pci-assign" },
> +    { "lsi53c895a", "lsi" },
>      { "virtio-balloon-pci", "virtio-balloon",
>              QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
>      { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_S390X },
> +    { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
>      { "virtio-net-ccw", "virtio-net", QEMU_ARCH_S390X },
> +    { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
>      { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_S390X },
> -    { "lsi53c895a", "lsi" },
> -    { "ich9-ahci", "ahci" },
> -    { "kvm-pci-assign", "pci-assign" },
> -    { "e1000", "e1000-82540em" },
> +    { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
>      { }
>  };

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Sascha Silbe Feb. 11, 2016, 4:32 p.m. UTC | #3
Dear Markus,

Markus Armbruster <armbru@redhat.com> writes:

> Sascha Silbe <silbe@linux.vnet.ibm.com> writes:
>
>> Sort the alias table by typename so it's easier to see which aliases
>> exist.
[...]
[qdev-monitor.c]
>
> Suggest to add
>
>        /* Please keep this table sorted */

Good idea. I've amended the following locally:

/* Please keep this table sorted by typename. */


Holding onto this patch for a few more days to give virtio devs a chance
to decide on whether to add the full set right away.


> Reviewed-by: Markus Armbruster <armbru@redhat.com>

Thanks for the reviews!

Sascha
diff mbox

Patch

diff --git a/qdev-monitor.c b/qdev-monitor.c
index 81e3ff3..0145deb 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -40,18 +40,18 @@  typedef struct QDevAlias
 } QDevAlias;
 
 static const QDevAlias qdev_alias_table[] = {
-    { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
-    { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
-    { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
+    { "e1000", "e1000-82540em" },
+    { "ich9-ahci", "ahci" },
+    { "kvm-pci-assign", "pci-assign" },
+    { "lsi53c895a", "lsi" },
     { "virtio-balloon-pci", "virtio-balloon",
             QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
     { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_S390X },
+    { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
     { "virtio-net-ccw", "virtio-net", QEMU_ARCH_S390X },
+    { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
     { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_S390X },
-    { "lsi53c895a", "lsi" },
-    { "ich9-ahci", "ahci" },
-    { "kvm-pci-assign", "pci-assign" },
-    { "e1000", "e1000-82540em" },
+    { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X },
     { }
 };