At 03/24/2011 09:33 AM, KAMEZAWA Hiroyuki Write:
>>From fa4ecbfabe3ec0bcf120bedf20583a2045430f65 Mon Sep 17 00:00:00 2001
> From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
> Date: Thu, 24 Mar 2011 10:26:56 +0900
> Subject: [PATCHv6 3/3] libvirt/qemu - support persistent modification of qemu nics.
> support changes of interfaces by VIR_DOMAIN_DEVICE_MODIFY_CONFIG
> for qemu.
>
> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
> Changelog v5->v6
> - fixed pci address assign failure case.
> Changelog v4->v5
> - fixed mac handling.
> - moved some functions to domain_conf.c
> - clean up.
> ---
> src/conf/domain_conf.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
> src/conf/domain_conf.h | 5 ++++
> src/libvirt_private.syms | 4 +++
> src/qemu/qemu_driver.c | 38 +++++++++++++++++++++++++++++++
> 4 files changed, 103 insertions(+), 0 deletions(-)
>
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 1bf8fbe..3c5c87c 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -4952,6 +4952,62 @@ int virDomainDiskRemoveByName(virDomainDefPtr def, const char *name)
> return 0;
> }
>
> +int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net)
> +{
> + if (VIR_REALLOC_N(def->nets, def->nnets) < 0)
> + return -1;
OOPS, s/def->nnets/def->nnets+1/
> + def->nets[def->nnets] = net;
> + def->nnets++;
> + return 0;
> +}
> +
> +int virDomainNetIndexByMac(virDomainDefPtr def, const unsigned char*mac)
> +{
> + int i;
> +
> + for (i = 0; i < def->nnets; i++)
> + if (memcmp(def->nets[i]->mac, mac, VIR_MAC_BUFLEN))
> + return i;
> + return -1;
> +}
> +
> +int virDomainNetIndexByIfname(virDomainDefPtr def, const char*name)
> +{
> + int i;
> +
> + for (i = 0; i < def->nnets; i++) {
> + if (def->nets[i]->ifname && STREQ(def->nets[i]->ifname, name))
> + return i;
> + }
> + return -1;
> +}
> +
> +static void virDomainNetRemove(virDomainDefPtr def, size_t i)
> +{
> + if (def->nnets > 1) {
> + memmove(def->nets + i,
> + def->nets + i + 1,
> + sizeof(*def->nets) * (def->nnets - (i + 1)));
> + def->nnets--;
> + if (VIR_REALLOC_N(def->nets, def->nnets) < 0) {
> + /* ignore harmless */
> + }
> + } else {
> + VIR_FREE(def->nets);
> + def->nnets = 0;
> + }
> +}
> +
> +int virDomainNetRemoveByMac(virDomainDefPtr def, const unsigned char *mac)
> +{
> + int i;
> +
> + i = virDomainNetIndexByMac(def, mac);
> + if (i < 0)
> + return -1;
> + virDomainNetRemove(def, i);
> + return 0;
> +}
>
> int virDomainControllerInsert(virDomainDefPtr def,
> virDomainControllerDefPtr controller)
> diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
> index 236ad04..19a521c 100644
> --- a/src/conf/domain_conf.h
> +++ b/src/conf/domain_conf.h
> @@ -1268,6 +1268,11 @@ int virDomainDiskDefAssignAddress(virCapsPtr caps, virDomainDiskDefPtr def);
> void virDomainDiskRemove(virDomainDefPtr def, size_t i);
> int virDomainDiskRemoveByName(virDomainDefPtr def, const char *name);
>
> +int virDomainNetIndexByIfname(virDomainDefPtr def, const char *ifname);
> +int virDomainNetIndexByMac(virDomainDefPtr def, const unsigned char *mac);
> +int virDomainNetInsert(virDomainDefPtr dev, virDomainNetDefPtr net);
> +int virDomainNetRemoveByMac(virDomainDefPtr def, const unsigned char *mac);
> +
> int virDomainControllerInsert(virDomainDefPtr def,
> virDomainControllerDefPtr controller);
> void virDomainControllerInsertPreAlloced(virDomainDefPtr def,
> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
> index 9ced196..50cdebf 100644
> --- a/src/libvirt_private.syms
> +++ b/src/libvirt_private.syms
> @@ -277,6 +277,10 @@ virDomainMemballoonModelTypeFromString;
> virDomainMemballoonModelTypeToString;
> virDomainNetDefFree;
> virDomainNetTypeToString;
> +virDomainNetIndexByIfname;
> +virDomainNetIndexByMac;
> +virDomainNetInsert;
> +virDomainNetRemoveByMac;
> virDomainObjAssignDef;
> virDomainObjSetDefTransient;
> virDomainObjGetPersistentDef;
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 386b654..371dee6 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -4166,6 +4166,7 @@ static int qemuDomainAttachDevicePersistent(virDomainDefPtr vmdef,
> virDomainDeviceDefPtr newdev)
> {
> virDomainDiskDefPtr disk;
> + virDomainNetDefPtr net;
> bool pci;
> int ret;
>
> @@ -4188,6 +4189,31 @@ static int qemuDomainAttachDevicePersistent(virDomainDefPtr vmdef,
> else
> newdev->data.disk = NULL;
> break;
> + case VIR_DOMAIN_DEVICE_NET:
> + net = newdev->data.net;
> + /* check mac */
> + if (virDomainNetIndexByMac(vmdef, net->mac) >= 0) {
> + char macbuf[VIR_MAC_STRING_BUFLEN];
> +
> + virFormatMacAddr(net->mac, macbuf);
> + qemuReportError(VIR_ERR_INVALID_ARG,
> + _("target mac %s already exists."), macbuf);
'return -1' is misssed.
> + }
> + /* Sanity check : test ifname confliction. */
> + if (net->ifname && virDomainNetIndexByIfname(vmdef, net->ifname) >= 0) {
> + qemuReportError(VIR_ERR_INVALID_ARG,
> + _("target NIC %s already exists."), net->ifname);
the same as above.
> + }
> + if (virDomainNetInsert(vmdef, net)) {
> + virReportOOMError();
> + return -1;
> + }
> + ret = qemuDomainDeviceAddressFixup(vmdef, true);
> + if (ret < 0)
> + virDomainNetRemoveByMac(vmdef, net->mac);
> + else
> + newdev->data.net = NULL;
> + break;
> default:
> qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> _("Sorry, the device is not supported for now"));
> @@ -4201,6 +4227,7 @@ static int qemuDomainDetachDevicePersistent(virDomainDefPtr vmdef,
> virDomainDeviceDefPtr device)
> {
> virDomainDiskDefPtr disk;
> + virDomainNetDefPtr net;
>
> switch(device->type) {
> case VIR_DOMAIN_DEVICE_DISK:
> @@ -4211,6 +4238,17 @@ static int qemuDomainDetachDevicePersistent(virDomainDefPtr vmdef,
> return -1;
> }
> break;
> + case VIR_DOMAIN_DEVICE_NET:
> + net = device->data.net;
> + if (virDomainNetRemoveByMac(vmdef, net->mac)) {
> + char macbuf[VIR_MAC_STRING_BUFLEN];
> +
> + virFormatMacAddr(net->mac, macbuf);
> + qemuReportError(VIR_ERR_INVALID_ARG,
> + _("no interface with mac %s"), macbuf);
> + return -1;
> + }
> + break;
> default:
> qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> _("Sorry, the device is not supported for now"));
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list