[libvirt] [PATCH] Revert "Introduce QEMU_CAPS_ARM_VIRT_PCI"

The capability was not used up to the feature freeze. This reverts commit 7f3515b4bb677d0ead1887547efc844e4761268a. --- src/qemu/qemu_capabilities.c | 4 ---- src/qemu/qemu_capabilities.h | 1 - 2 files changed, 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e7002a3..27686c3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -287,7 +287,6 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "aarch64-off", "vhost-user-multiqueue", /* 190 */ - "arm-virt-pci", ); @@ -1337,9 +1336,6 @@ virQEMUCapsComputeCmdFlags(const char *help, virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); } - if (version >= 2003000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_ARM_VIRT_PCI); - return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f4180a8..30aa504 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -230,7 +230,6 @@ typedef enum { QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ - QEMU_CAPS_ARM_VIRT_PCI = 191, /* ARM 'virt' machine has PCI bus */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; -- 2.4.1

On 29.06.2015 09:58, Peter Krempa wrote:
The capability was not used up to the feature freeze.
This reverts commit 7f3515b4bb677d0ead1887547efc844e4761268a. --- src/qemu/qemu_capabilities.c | 4 ---- src/qemu/qemu_capabilities.h | 1 - 2 files changed, 5 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e7002a3..27686c3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -287,7 +287,6 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "aarch64-off",
"vhost-user-multiqueue", /* 190 */ - "arm-virt-pci", );
@@ -1337,9 +1336,6 @@ virQEMUCapsComputeCmdFlags(const char *help, virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); }
- if (version >= 2003000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_ARM_VIRT_PCI); - return 0; }
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f4180a8..30aa504 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -230,7 +230,6 @@ typedef enum { QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ - QEMU_CAPS_ARM_VIRT_PCI = 191, /* ARM 'virt' machine has PCI bus */
QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags;
I'm inclined to ACK this, but I'd love to hear committer or original author's opinions. Michal

Hello!
I'm inclined to ACK this, but I'd love to hear committer or original author's opinions.
1. Does it really harm? We are going to use it soon. Unfortunately looks like we have opinion collision with Cole who says that virtio-pci support is bad only because current distros don't support it. Because for some weird reason, i guess, PCI support is disabled in the kernel. 2. Unfortunately, the patch is wrong. I was setting the capability in wrong place, it should be in virQEMUCapsInitQMPMonitor() instead of virQEMUCapsComputeCmdFlags(). My fault, and how i managed to test this is another story. :( Kind regards, Pavel Fedin Expert Engineer Samsung Electronics Research center Russia
-----Original Message----- From: Michal Privoznik [mailto:mprivozn@redhat.com] Sent: Tuesday, June 30, 2015 1:02 PM To: Peter Krempa; libvir-list@redhat.com Cc: Pavel Fedin; Cole Robinson Subject: Re: [libvirt] [PATCH] Revert "Introduce QEMU_CAPS_ARM_VIRT_PCI"
On 29.06.2015 09:58, Peter Krempa wrote:
The capability was not used up to the feature freeze.
This reverts commit 7f3515b4bb677d0ead1887547efc844e4761268a. --- src/qemu/qemu_capabilities.c | 4 ---- src/qemu/qemu_capabilities.h | 1 - 2 files changed, 5 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e7002a3..27686c3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -287,7 +287,6 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "aarch64-off",
"vhost-user-multiqueue", /* 190 */ - "arm-virt-pci", );
@@ -1337,9 +1336,6 @@ virQEMUCapsComputeCmdFlags(const char *help, virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); }
- if (version >= 2003000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_ARM_VIRT_PCI); - return 0; }
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f4180a8..30aa504 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -230,7 +230,6 @@ typedef enum { QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ - QEMU_CAPS_ARM_VIRT_PCI = 191, /* ARM 'virt' machine has PCI bus */
QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags;
I'm inclined to ACK this, but I'd love to hear committer or original author's opinions.
Michal

On Tue, Jun 30, 2015 at 14:06:27 +0300, Pavel Fedin wrote:
Hello!
I'm inclined to ACK this, but I'd love to hear committer or original author's opinions.
1. Does it really harm? We are going to use it soon. Unfortunately looks like we have opinion collision with Cole who says that virtio-pci support is bad only because current distros don't support it. Because for some weird reason, i guess, PCI support is disabled in the kernel.
In case we would never add this feature in the next releases or decide for a different capability then we'd need to carry this stuff forever. I'm not opposed to the capability. I'm opposed to the fact that we would ship it without knowing whether it will be used ever. That's why such stuff should be pushed along with the patch that is actually using it. Peter

On 06/30/2015 06:01 AM, Michal Privoznik wrote:
On 29.06.2015 09:58, Peter Krempa wrote:
The capability was not used up to the feature freeze.
This reverts commit 7f3515b4bb677d0ead1887547efc844e4761268a. --- src/qemu/qemu_capabilities.c | 4 ---- src/qemu/qemu_capabilities.h | 1 - 2 files changed, 5 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e7002a3..27686c3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -287,7 +287,6 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "aarch64-off",
"vhost-user-multiqueue", /* 190 */ - "arm-virt-pci", );
@@ -1337,9 +1336,6 @@ virQEMUCapsComputeCmdFlags(const char *help, virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); }
- if (version >= 2003000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_ARM_VIRT_PCI); - return 0; }
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f4180a8..30aa504 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -230,7 +230,6 @@ typedef enum { QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ - QEMU_CAPS_ARM_VIRT_PCI = 191, /* ARM 'virt' machine has PCI bus */
QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags;
I'm inclined to ACK this, but I'd love to hear committer or original author's opinions.
Michal
I see it was already reverted, but regardless I'm fine with it. Thanks, Cole

On Mon, Jun 29, 2015 at 09:58:19AM +0200, Peter Krempa wrote:
The capability was not used up to the feature freeze.
This reverts commit 7f3515b4bb677d0ead1887547efc844e4761268a. --- src/qemu/qemu_capabilities.c | 4 ---- src/qemu/qemu_capabilities.h | 1 - 2 files changed, 5 deletions(-)
ACK Jan

On Tue, Jun 30, 2015 at 13:28:12 +0200, Ján Tomko wrote:
On Mon, Jun 29, 2015 at 09:58:19AM +0200, Peter Krempa wrote:
The capability was not used up to the feature freeze.
This reverts commit 7f3515b4bb677d0ead1887547efc844e4761268a. --- src/qemu/qemu_capabilities.c | 4 ---- src/qemu/qemu_capabilities.h | 1 - 2 files changed, 5 deletions(-)
ACK
Pushed; Thanks. Peter
participants (5)
-
Cole Robinson
-
Ján Tomko
-
Michal Privoznik
-
Pavel Fedin
-
Peter Krempa