[libvirt] [PATCH 0/5] qemu: Fix rest of hot/cold-add/remove device functions to use typecasted switch
5:44 a.m.
Tweak the rest of the stuff to get notified at compile time when adding a new
device type to implement it's backend functions.
Peter Krempa (5):
qemu: Convert qemuDomainDetachDeviceLive to typecasted enum
qemu: Convert qemuDomainUpdateDeviceLive to typecasted enum
qemu: Convert qemuDomainAttachDeviceConfig to typecasted enum
qemu: Convert qemuDomainDetachDeviceConfig to typecasted enum
qemu: Convert qemuDomainUpdateDeviceConfig to typecasted enum
src/qemu/qemu_driver.c | 96 ++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 85 insertions(+), 11 deletions(-)
--
2.1.0
5:44 a.m.
New subject: [libvirt] [PATCH 1/5] qemu: Convert qemuDomainDetachDeviceLive to typecasted enum
---
src/qemu/qemu_driver.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e0fd4c0..b981e05 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6910,7 +6910,7 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm,
virQEMUDriverPtr driver = dom->conn->privateData;
int ret = -1;
- switch (dev->type) {
+ switch ((virDomainDeviceType) dev->type) {
case VIR_DOMAIN_DEVICE_DISK:
ret = qemuDomainDetachDeviceDiskLive(driver, vm, dev);
break;
@@ -6929,7 +6929,21 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm,
case VIR_DOMAIN_DEVICE_CHR:
ret = qemuDomainDetachChrDevice(driver, vm, dev->data.chr);
break;
- default:
+ case VIR_DOMAIN_DEVICE_FS:
+ case VIR_DOMAIN_DEVICE_INPUT:
+ case VIR_DOMAIN_DEVICE_SOUND:
+ case VIR_DOMAIN_DEVICE_VIDEO:
+ case VIR_DOMAIN_DEVICE_WATCHDOG:
+ case VIR_DOMAIN_DEVICE_GRAPHICS:
+ case VIR_DOMAIN_DEVICE_HUB:
+ case VIR_DOMAIN_DEVICE_SMARTCARD:
+ case VIR_DOMAIN_DEVICE_MEMBALLOON:
+ case VIR_DOMAIN_DEVICE_NVRAM:
+ case VIR_DOMAIN_DEVICE_RNG:
+ case VIR_DOMAIN_DEVICE_SHMEM:
+ case VIR_DOMAIN_DEVICE_REDIRDEV:
+ case VIR_DOMAIN_DEVICE_NONE:
+ case VIR_DOMAIN_DEVICE_LAST:
virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("live detach of device '%s' is not
supported"),
virDomainDeviceTypeToString(dev->type));
--
2.1.0
5:44 a.m.
New subject: [libvirt] [PATCH 2/5] qemu: Convert qemuDomainUpdateDeviceLive to typecasted enum
---
src/qemu/qemu_driver.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b981e05..31d48b2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7025,7 +7025,7 @@ qemuDomainUpdateDeviceLive(virConnectPtr conn,
virQEMUDriverPtr driver = dom->conn->privateData;
int ret = -1;
- switch (dev->type) {
+ switch ((virDomainDeviceType) dev->type) {
case VIR_DOMAIN_DEVICE_DISK:
ret = qemuDomainChangeDiskMediaLive(conn, vm, dev, driver, force);
break;
@@ -7035,7 +7035,24 @@ qemuDomainUpdateDeviceLive(virConnectPtr conn,
case VIR_DOMAIN_DEVICE_NET:
ret = qemuDomainChangeNet(driver, vm, dom, dev);
break;
- default:
+ case VIR_DOMAIN_DEVICE_FS:
+ case VIR_DOMAIN_DEVICE_INPUT:
+ case VIR_DOMAIN_DEVICE_SOUND:
+ case VIR_DOMAIN_DEVICE_VIDEO:
+ case VIR_DOMAIN_DEVICE_WATCHDOG:
+ case VIR_DOMAIN_DEVICE_HUB:
+ case VIR_DOMAIN_DEVICE_SMARTCARD:
+ case VIR_DOMAIN_DEVICE_MEMBALLOON:
+ case VIR_DOMAIN_DEVICE_NVRAM:
+ case VIR_DOMAIN_DEVICE_RNG:
+ case VIR_DOMAIN_DEVICE_SHMEM:
+ case VIR_DOMAIN_DEVICE_LEASE:
+ case VIR_DOMAIN_DEVICE_HOSTDEV:
+ case VIR_DOMAIN_DEVICE_CONTROLLER:
+ case VIR_DOMAIN_DEVICE_REDIRDEV:
+ case VIR_DOMAIN_DEVICE_CHR:
+ case VIR_DOMAIN_DEVICE_NONE:
+ case VIR_DOMAIN_DEVICE_LAST:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("live update of device '%s' is not
supported"),
virDomainDeviceTypeToString(dev->type));
--
2.1.0
5:44 a.m.
New subject: [libvirt] [PATCH 3/5] qemu: Convert qemuDomainAttachDeviceConfig to typecasted enum
---
src/qemu/qemu_driver.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 31d48b2..66fbcf2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7074,7 +7074,7 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps,
virDomainControllerDefPtr controller;
virDomainFSDefPtr fs;
- switch (dev->type) {
+ switch ((virDomainDeviceType) dev->type) {
case VIR_DOMAIN_DEVICE_DISK:
disk = dev->data.disk;
if (virDomainDiskIndexByName(vmdef, disk->dst, true) >= 0) {
@@ -7169,7 +7169,20 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps,
dev->data.fs = NULL;
break;
- default:
+ case VIR_DOMAIN_DEVICE_INPUT:
+ case VIR_DOMAIN_DEVICE_SOUND:
+ case VIR_DOMAIN_DEVICE_VIDEO:
+ case VIR_DOMAIN_DEVICE_WATCHDOG:
+ case VIR_DOMAIN_DEVICE_GRAPHICS:
+ case VIR_DOMAIN_DEVICE_HUB:
+ case VIR_DOMAIN_DEVICE_SMARTCARD:
+ case VIR_DOMAIN_DEVICE_MEMBALLOON:
+ case VIR_DOMAIN_DEVICE_NVRAM:
+ case VIR_DOMAIN_DEVICE_RNG:
+ case VIR_DOMAIN_DEVICE_SHMEM:
+ case VIR_DOMAIN_DEVICE_REDIRDEV:
+ case VIR_DOMAIN_DEVICE_NONE:
+ case VIR_DOMAIN_DEVICE_LAST:
virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("persistent attach of device '%s' is not
supported"),
virDomainDeviceTypeToString(dev->type));
--
2.1.0
5:44 a.m.
New subject: [libvirt] [PATCH 4/5] qemu: Convert qemuDomainDetachDeviceConfig to typecasted enum
---
src/qemu/qemu_driver.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 66fbcf2..92fd42e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7205,7 +7205,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
virDomainFSDefPtr fs;
int idx;
- switch (dev->type) {
+ switch ((virDomainDeviceType) dev->type) {
case VIR_DOMAIN_DEVICE_DISK:
disk = dev->data.disk;
if (!(det_disk = virDomainDiskRemoveByName(vmdef, disk->dst))) {
@@ -7283,7 +7283,20 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
virDomainFSDefFree(fs);
break;
- default:
+ case VIR_DOMAIN_DEVICE_INPUT:
+ case VIR_DOMAIN_DEVICE_SOUND:
+ case VIR_DOMAIN_DEVICE_VIDEO:
+ case VIR_DOMAIN_DEVICE_WATCHDOG:
+ case VIR_DOMAIN_DEVICE_GRAPHICS:
+ case VIR_DOMAIN_DEVICE_HUB:
+ case VIR_DOMAIN_DEVICE_SMARTCARD:
+ case VIR_DOMAIN_DEVICE_MEMBALLOON:
+ case VIR_DOMAIN_DEVICE_NVRAM:
+ case VIR_DOMAIN_DEVICE_RNG:
+ case VIR_DOMAIN_DEVICE_SHMEM:
+ case VIR_DOMAIN_DEVICE_REDIRDEV:
+ case VIR_DOMAIN_DEVICE_NONE:
+ case VIR_DOMAIN_DEVICE_LAST:
virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("persistent detach of device '%s' is not
supported"),
virDomainDeviceTypeToString(dev->type));
--
2.1.0
5:44 a.m.
New subject: [libvirt] [PATCH 5/5] qemu: Convert qemuDomainUpdateDeviceConfig to typecasted enum
---
src/qemu/qemu_driver.c | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 92fd42e..7377320 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7314,8 +7314,7 @@ qemuDomainUpdateDeviceConfig(virQEMUCapsPtr qemuCaps,
virDomainNetDefPtr net;
int pos;
-
- switch (dev->type) {
+ switch ((virDomainDeviceType) dev->type) {
case VIR_DOMAIN_DEVICE_DISK:
disk = dev->data.disk;
pos = virDomainDiskIndexByName(vmdef, disk->dst, false);
@@ -7363,7 +7362,25 @@ qemuDomainUpdateDeviceConfig(virQEMUCapsPtr qemuCaps,
return -1;
break;
- default:
+ case VIR_DOMAIN_DEVICE_FS:
+ case VIR_DOMAIN_DEVICE_INPUT:
+ case VIR_DOMAIN_DEVICE_SOUND:
+ case VIR_DOMAIN_DEVICE_VIDEO:
+ case VIR_DOMAIN_DEVICE_WATCHDOG:
+ case VIR_DOMAIN_DEVICE_GRAPHICS:
+ case VIR_DOMAIN_DEVICE_HUB:
+ case VIR_DOMAIN_DEVICE_SMARTCARD:
+ case VIR_DOMAIN_DEVICE_MEMBALLOON:
+ case VIR_DOMAIN_DEVICE_NVRAM:
+ case VIR_DOMAIN_DEVICE_RNG:
+ case VIR_DOMAIN_DEVICE_SHMEM:
+ case VIR_DOMAIN_DEVICE_LEASE:
+ case VIR_DOMAIN_DEVICE_HOSTDEV:
+ case VIR_DOMAIN_DEVICE_CONTROLLER:
+ case VIR_DOMAIN_DEVICE_REDIRDEV:
+ case VIR_DOMAIN_DEVICE_CHR:
+ case VIR_DOMAIN_DEVICE_NONE:
+ case VIR_DOMAIN_DEVICE_LAST:
virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("persistent update of device '%s' is not
supported"),
virDomainDeviceTypeToString(dev->type));
--
2.1.0
5:57 a.m.
On 10/15/2014 06:44 AM, Peter Krempa wrote:
Tweak the rest of the stuff to get notified at compile time when
adding a new
device type to implement it's backend functions.
Peter Krempa (5):
qemu: Convert qemuDomainDetachDeviceLive to typecasted enum
qemu: Convert qemuDomainUpdateDeviceLive to typecasted enum
qemu: Convert qemuDomainAttachDeviceConfig to typecasted enum
qemu: Convert qemuDomainDetachDeviceConfig to typecasted enum
qemu: Convert qemuDomainUpdateDeviceConfig to typecasted enum
src/qemu/qemu_driver.c | 96 ++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 85 insertions(+), 11 deletions(-)
ACK series
John
6:46 a.m.
On 10/15/14 12:57, John Ferlan wrote:
On 10/15/2014 06:44 AM, Peter Krempa wrote:
> Tweak the rest of the stuff to get notified at compile time when adding a new
> device type to implement it's backend functions.
>
> Peter Krempa (5):
> qemu: Convert qemuDomainDetachDeviceLive to typecasted enum
> qemu: Convert qemuDomainUpdateDeviceLive to typecasted enum
> qemu: Convert qemuDomainAttachDeviceConfig to typecasted enum
> qemu: Convert qemuDomainDetachDeviceConfig to typecasted enum
> qemu: Convert qemuDomainUpdateDeviceConfig to typecasted enum
>
> src/qemu/qemu_driver.c | 96 ++++++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 85 insertions(+), 11 deletions(-)
>
ACK series
John
Pushed; Thanks.
Peter
3691
days inactive
3691
days old
7 comments
2 participants
participants (2)
-
John Ferlan -
Peter Krempa