- Devel - libvirt List Archives

[libvirt] [PATCH] domain_conf.c: Initialize arrVar and cntVar
by Michal Privoznik 16 Oct '13

16 Oct '13

Some ancient gcc fails to see the variables are initialized in a separate function and a false positive is produced: cc1: warnings being treated as errors conf/domain_conf.c: In function 'virDomainChrGetDomainPtrs': conf/domain_conf.c:10342: error: 'arrVar' may be used uninitialized in this function [-Wuninitialized] conf/domain_conf.c:10343: error: 'cntVar' may be used uninitialized in this function [-Wuninitialized] conf/domain_conf.c: In function 'virDomainChrInsert': conf/domain_conf.c:10362: error: 'arrPtr' may be used uninitialized in this function [-Wuninitialized] conf/domain_conf.c:10363: error: 'cntPtr' may be used uninitialized in this function [-Wuninitialized] conf/domain_conf.c: In function 'virDomainChrRemove': conf/domain_conf.c:10374: error: 'arrPtr' may be used uninitialized in this function [-Wuninitialized] conf/domain_conf.c:10375: error: 'cntPtr' may be used uninitialized in this function [-Wuninitialized] Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker and trivial rules. src/conf/domain_conf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 365de77..562d98b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10339,8 +10339,8 @@ virDomainChrGetDomainPtrs(const virDomainDef *vmdef, const virDomainChrDef ***arrPtr, size_t *cntPtr) { - virDomainChrDef ***arrVar; - size_t *cntVar; + virDomainChrDef ***arrVar = NULL; + size_t *cntVar = NULL; /* Cast away const; we add it back in the final assignment. */ virDomainChrGetDomainPtrsInternal((virDomainDefPtr) vmdef, type, @@ -10359,8 +10359,8 @@ int virDomainChrInsert(virDomainDefPtr vmdef, virDomainChrDefPtr chr) { - virDomainChrDefPtr **arrPtr; - size_t *cntPtr; + virDomainChrDefPtr **arrPtr = NULL; + size_t *cntPtr = NULL; virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, &arrPtr, &cntPtr); @@ -10371,8 +10371,8 @@ virDomainChrDefPtr virDomainChrRemove(virDomainDefPtr vmdef, virDomainChrDefPtr chr) { - virDomainChrDefPtr ret, **arrPtr; - size_t i, *cntPtr; + virDomainChrDefPtr ret, **arrPtr = NULL; + size_t i, *cntPtr = NULL; virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, &arrPtr, &cntPtr); -- 1.8.1.5

1 0

[libvirt] [PATCH 1/2] vbox: assemble duplicate state conversions
by Ryota Ozaki 16 Oct '13

16 Oct '13

Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> --- src/vbox/vbox_tmpl.c | 70 +++++++++++++++++----------------------------------- 1 file changed, 22 insertions(+), 48 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 5e5ea85..10a3775 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1912,6 +1912,26 @@ cleanup: return ret; } +static virDomainState vboxConvertState(enum MachineState state) { + switch (state) { + case MachineState_Running: + return VIR_DOMAIN_RUNNING; + case MachineState_Stuck: + return VIR_DOMAIN_BLOCKED; + case MachineState_Paused: + return VIR_DOMAIN_PAUSED; + case MachineState_Stopping: + return VIR_DOMAIN_SHUTDOWN; + case MachineState_PoweredOff: + return VIR_DOMAIN_SHUTOFF; + case MachineState_Aborted: + return VIR_DOMAIN_CRASHED; + case MachineState_Null: + default: + return VIR_DOMAIN_NOSTATE; + } +} + static int vboxDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { VBOX_OBJECT_CHECK(dom->conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; @@ -1972,30 +1992,7 @@ static int vboxDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { info->nrVirtCpu = CPUCount; info->memory = memorySize * 1024; info->maxMem = maxMemorySize * 1024; - switch (state) { - case MachineState_Running: - info->state = VIR_DOMAIN_RUNNING; - break; - case MachineState_Stuck: - info->state = VIR_DOMAIN_BLOCKED; - break; - case MachineState_Paused: - info->state = VIR_DOMAIN_PAUSED; - break; - case MachineState_Stopping: - info->state = VIR_DOMAIN_SHUTDOWN; - break; - case MachineState_PoweredOff: - info->state = VIR_DOMAIN_SHUTOFF; - break; - case MachineState_Aborted: - info->state = VIR_DOMAIN_CRASHED; - break; - case MachineState_Null: - default: - info->state = VIR_DOMAIN_NOSTATE; - break; - } + info->state = vboxConvertState(state); ret = 0; } @@ -2038,30 +2035,7 @@ vboxDomainGetState(virDomainPtr dom, machine->vtbl->GetState(machine, &mstate); - switch (mstate) { - case MachineState_Running: - *state = VIR_DOMAIN_RUNNING; - break; - case MachineState_Stuck: - *state = VIR_DOMAIN_BLOCKED; - break; - case MachineState_Paused: - *state = VIR_DOMAIN_PAUSED; - break; - case MachineState_Stopping: - *state = VIR_DOMAIN_SHUTDOWN; - break; - case MachineState_PoweredOff: - *state = VIR_DOMAIN_SHUTOFF; - break; - case MachineState_Aborted: - *state = VIR_DOMAIN_CRASHED; - break; - case MachineState_Null: - default: - *state = VIR_DOMAIN_NOSTATE; - break; - } + *state = vboxConvertState(mstate); if (reason) *reason = 0; -- 1.8.4

2 4

[libvirt] [RESEND][PATCH] esx: Fix floppy.fileName handling in the vmx file parser
by Geoff Hickey 16 Oct '13

16 Oct '13

[Updated to include unit tests] The vmx file parsing code was reporting errors when parsing floppy.fileName entries if the filename didn't end in .flp. There is no such restriction in ESX; even using the GUI to configure floppy filenames you can specify any arbitrary file with any extension. Fix by changing the vmx parsing code so that it uses the floppy.fileType value to determine whether floppy.fileName refers to a block device or a regular file. Also remove code that would have generated an error if no floppy.fileName was specified. This is not an error either. Updated the floppy tests in vmx2xmltest.c and xml2vmxtest.c. --- src/vmx/vmx.c | 28 ++++------------------------ tests/vmx2xmldata/vmx2xml-floppy-file.vmx | 3 +++ tests/vmx2xmldata/vmx2xml-floppy-file.xml | 5 +++++ tests/xml2vmxdata/xml2vmx-floppy-file.vmx | 4 +++- tests/xml2vmxdata/xml2vmx-floppy-file.xml | 4 ++++ 5 files changed, 19 insertions(+), 25 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 36bc338..48487f8 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2250,27 +2250,14 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto cleanup; } } else if (device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { - if (virFileHasSuffix(fileName, ".flp")) { - if (fileType != NULL) { - if (STRCASENEQ(fileType, "file")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'file' but " - "found '%s'"), fileType_name, fileType); - goto cleanup; - } - } - - (*def)->type = VIR_DOMAIN_DISK_TYPE_FILE; - (*def)->src = ctx->parseFileName(fileName, ctx->opaque); - - if ((*def)->src == NULL) { - goto cleanup; - } - } else if (fileType != NULL && STRCASEEQ(fileType, "device")) { + if (fileType != NULL && STRCASEEQ(fileType, "device")) { (*def)->type = VIR_DOMAIN_DISK_TYPE_BLOCK; (*def)->src = fileName; fileName = NULL; + } else if (fileType != NULL && STRCASEEQ(fileType, "file")) { + (*def)->type = VIR_DOMAIN_DISK_TYPE_FILE; + (*def)->src = ctx->parseFileName(fileName, ctx->opaque); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid or not yet handled value '%s' " @@ -3538,13 +3525,6 @@ virVMXFormatFloppy(virVMXContext *ctx, virDomainDiskDefPtr def, virBufferAsprintf(buffer, "floppy%d.fileType = \"file\"\n", unit); if (def->src != NULL) { - if (! virFileHasSuffix(def->src, ".flp")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Image file for floppy '%s' has unsupported " - "suffix, expecting '.flp'"), def->dst); - return -1; - } - fileName = ctx->formatFileName(def->src, ctx->opaque); if (fileName == NULL) { diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.vmx b/tests/vmx2xmldata/vmx2xml-floppy-file.vmx index b9ee81b..344ac78 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-file.vmx +++ b/tests/vmx2xmldata/vmx2xml-floppy-file.vmx @@ -3,3 +3,6 @@ virtualHW.version = "4" floppy0.present = "true" floppy0.fileType = "file" floppy0.fileName = "floppy.flp" +floppy1.present = "true" +floppy1.fileType = "file" +floppy1.fileName = "floppy" \ No newline at end of file diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.xml b/tests/vmx2xmldata/vmx2xml-floppy-file.xml index f62320f..40f70d3 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-file.xml +++ b/tests/vmx2xmldata/vmx2xml-floppy-file.xml @@ -16,6 +16,11 @@ <target dev='fda' bus='fdc'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> + <disk type='file' device='floppy'> + <source file='[datastore] directory/floppy'/> + <target dev='fdb' bus='fdc'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> <controller type='fdc' index='0'/> <video> <model type='vmvga' vram='4096'/> diff --git a/tests/xml2vmxdata/xml2vmx-floppy-file.vmx b/tests/xml2vmxdata/xml2vmx-floppy-file.vmx index 11ffb01..b8ffc1e 100644 --- a/tests/xml2vmxdata/xml2vmx-floppy-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-floppy-file.vmx @@ -9,4 +9,6 @@ numvcpus = "1" floppy0.present = "true" floppy0.fileType = "file" floppy0.fileName = "/vmfs/volumes/testing/floppy.flp" -floppy1.present = "false" +floppy1.present = "true" +floppy1.fileType = "file" +floppy1.fileName = "/vmfs/volumes/testing/floppy1" diff --git a/tests/xml2vmxdata/xml2vmx-floppy-file.xml b/tests/xml2vmxdata/xml2vmx-floppy-file.xml index 83598b3..119113a 100644 --- a/tests/xml2vmxdata/xml2vmx-floppy-file.xml +++ b/tests/xml2vmxdata/xml2vmx-floppy-file.xml @@ -10,5 +10,9 @@ <source file='[testing] floppy.flp'/> <target dev='fda' bus='fdc'/> </disk> + <disk type='file' device='floppy'> + <source file='[testing] floppy1'/> + <target dev='fdb' bus='fdc'/> + </disk> </devices> </domain> -- 1.8.1.2

2 2

[libvirt] [PATCH] network: Remove unnecessary check in networkRadvdConfContents
by Hongwei Bi 16 Oct '13

16 Oct '13

Since there is a check on configbuf through virBufferError(), it is not necessary to check configstr and report OOM again. Signed-off-by: Hongwei Bi <hwbi2008(a)gmail.com> --- src/network/bridge_driver.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 8787bdb..ec40e0c 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1312,10 +1312,7 @@ networkRadvdConfContents(virNetworkObjPtr network, char **configstr) virReportOOMError(); goto cleanup; } - if (!(*configstr = virBufferContentAndReset(&configbuf))) { - virReportOOMError(); - goto cleanup; - } + *configstr = virBufferContentAndReset(&configbuf); } ret = 0; -- 1.8.1.2

1 0

[libvirt] [PATCH] network: Add a missing check in bridge_driver.c
by Hongwei Bi 15 Oct '13

15 Oct '13

--- src/network/bridge_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 8787bdb..73375f0 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1107,7 +1107,8 @@ networkStartDhcpDaemon(virNetworkDriverStatePtr driver, if (dctx == NULL) goto cleanup; - dnsmasqCapsRefresh(&driver->dnsmasqCaps, false); + if (dnsmasqCapsRefresh(&driver->dnsmasqCaps, false) < 0) + goto cleanup; ret = networkBuildDhcpDaemonCommandLine(network, &cmd, pidfile, dctx, driver->dnsmasqCaps); -- 1.8.1.2

1 0

[libvirt] [PATCH] fix typo in lxc_driver.c and virsh-nodedev.c
by Hongwei Bi 15 Oct '13

15 Oct '13

--- src/lxc/lxc_driver.c | 2 +- tools/virsh-nodedev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index e3a34d6..870e4a9 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -887,7 +887,7 @@ cleanup: } /** - * lxcDomainCreateWithFlags: + * lxcDomainCreateWithFiles: * @dom: domain to start * @flags: Must be 0 for now * diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 3a2d12b..ebfac94 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -308,7 +308,7 @@ fallback: goto cleanup; } - /* Check if the device's capability matches with provied + /* Check if the device's capability matches with provided * capabilities. */ size_t j, k; -- 1.8.1.2

2 1

[libvirt] [PATCH] build: Add lxc testcase to dist list
by Daniel Hansel 15 Oct '13

15 Oct '13

Introduced by commit 3f029fb5319b9dc9cc2fbf8d1ba4505ee9e4b1e3 the RPM build was broken due to a missing LXC textcase. Signed-off-by: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com> --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 250cd8c..a47d376 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -69,6 +69,7 @@ EXTRA_DIST = \ fchostdata \ interfaceschemadata \ lxcxml2xmldata \ + lxcxml2xmloutdata \ networkschematest \ networkxml2xmlin \ networkxml2xmlout \ -- 1.7.9.5

2 1

[libvirt] [PATCH] qemu_migrate: Fix assign the same port when migrating concurrently
by Wangyufei (A) 15 Oct '13

15 Oct '13

>From f56b290eab36bbb7a9ac53778a55638d473504d1 Mon Sep 17 00:00:00 2001 From: WangYufei <james.wangyufei(a)huawei.com> Date: Fri, 11 Oct 2013 11:27:13 +0800 Subject: [PATCH] qemu_migrate: Fix assign the same port when migrating concurrently When we migrate vms concurrently, there's a chance that libvirtd on destination assign the same port for different migrations, which will lead to migration failed during migration prepare phase on destination. So we use virPortAllocator here to solve the problem. Signed-off-by: WangYufei <james.wangyufei(a)huawei.com> --- src/qemu/qemu_command.h | 3 +++ src/qemu/qemu_conf.h | 6 +++--- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 6 ++++++ src/qemu/qemu_migration.c | 28 +++++++++++++++++++++------- 5 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 2e2acfb..3277ba4 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -51,6 +51,9 @@ # define QEMU_WEBSOCKET_PORT_MIN 5700 # define QEMU_WEBSOCKET_PORT_MAX 65535 +# define QEMU_MIGRATION_PORT_MIN 49152 +# define QEMU_MIGRATION_PORT_MAX 49215 + typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; typedef qemuBuildCommandLineCallbacks *qemuBuildCommandLineCallbacksPtr; struct _qemuBuildCommandLineCallbacks { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index da29a2a..3176085 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -221,6 +221,9 @@ struct _virQEMUDriver { /* Immutable pointer, self-locking APIs */ virPortAllocatorPtr webSocketPorts; + /* Immutable pointer, self-locking APIs */ + virPortAllocatorPtr migrationPorts; + /* Immutable pointer, lockless APIs*/ virSysinfoDefPtr hostsysinfo; @@ -242,9 +245,6 @@ struct _qemuDomainCmdlineDef { char **env_value; }; -/* Port numbers used for KVM migration. */ -# define QEMUD_MIGRATION_FIRST_PORT 49152 -# define QEMUD_MIGRATION_NUM_PORTS 64 void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 21f116c..16c55a6 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -160,6 +160,7 @@ struct _qemuDomainObjPrivate { unsigned long migMaxBandwidth; char *origname; int nbdPort; /* Port used for migration with NBD */ + int migrationPort; virChrdevsPtr devs; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cfdbb9a..c08a73c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -687,6 +687,11 @@ qemuStateInitialize(bool privileged, cfg->webSocketPortMax)) == NULL) goto error; + if ((qemu_driver->migrationPorts = + virPortAllocatorNew(QEMU_MIGRATION_PORT_MIN, + QEMU_MIGRATION_PORT_MAX)) == NULL) + goto error; + if (qemuSecurityInit(qemu_driver) < 0) goto error; @@ -993,6 +998,7 @@ qemuStateCleanup(void) { virObjectUnref(qemu_driver->domains); virObjectUnref(qemu_driver->remotePorts); virObjectUnref(qemu_driver->webSocketPorts); + virObjectUnref(qemu_driver->migrationPorts); virObjectUnref(qemu_driver->xmlopt); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3a1aab7..93ae237 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2147,6 +2147,9 @@ qemuMigrationPrepareCleanup(virQEMUDriverPtr driver, qemuDomainJobTypeToString(priv->job.active), qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + virPortAllocatorRelease(driver->migrationPorts, priv->migrationPort); + priv->migrationPort = 0; + if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_IN)) return; qemuDomainObjDiscardAsyncJob(driver, vm); @@ -2297,6 +2300,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, *def = NULL; priv = vm->privateData; + priv->migrationPort = port; if (VIR_STRDUP(priv->origname, origname) < 0) goto cleanup; @@ -2415,6 +2419,11 @@ cleanup: VIR_FREE(xmlout); VIR_FORCE_CLOSE(dataFD[0]); VIR_FORCE_CLOSE(dataFD[1]); + if (ret < 0) { + virPortAllocatorRelease(driver->migrationPorts, port); + if (priv) + priv->migrationPort = 0; + } if (vm) { if (ret >= 0 || vm->persistent) virObjectUnlock(vm); @@ -2493,7 +2502,6 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *origname, unsigned long flags) { - static int port = 0; int this_port; char *hostname = NULL; const char *p; @@ -2521,8 +2529,9 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * to be a correct hostname which refers to the target machine). */ if (uri_in == NULL) { - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; - if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; + if (virPortAllocatorAcquire(driver->migrationPorts, + (unsigned short *)&this_port) < 0) + goto cleanup; /* Get hostname */ if ((hostname = virGetHostname()) == NULL) @@ -2578,9 +2587,9 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, if (uri->port == 0) { /* Generate a port */ - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; - if (port == QEMUD_MIGRATION_NUM_PORTS) - port = 0; + if (virPortAllocatorAcquire(driver->migrationPorts, + (unsigned short *)&this_port) < 0) + goto cleanup; /* Caller frees */ if (virAsprintf(uri_out, "%s:%d", uri_in, this_port) < 0) @@ -2600,8 +2609,11 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, cleanup: virURIFree(uri); VIR_FREE(hostname); - if (ret != 0) + if (ret != 0) { VIR_FREE(*uri_out); + virPortAllocatorRelease(driver->migrationPorts, + (unsigned short)this_port); + } return ret; } @@ -4370,6 +4382,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } qemuMigrationStopNBDServer(driver, vm, mig); + virPortAllocatorRelease(driver->migrationPorts, priv->migrationPort); + priv->migrationPort = 0; if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

3 3

[libvirt] [RFC] net-dhcp-leases: virNetworkDHCPLeases struct design
by Nehal J Wani 15 Oct '13

15 Oct '13

Continued from https://www.redhat.com/archives/libvir-list/2013-October/msg00325.html Earlier, the virNetworkDHCPLeases struct design was: struct _virNetworkDHCPLeases { long long expirytime; /* Seconds since epoch */ union { char *mac; /* MAC address */ unsigned long iaid; /* Identity association identifier (IAID) */ } id; char *ipaddr; /* IP address */ char *hostname; /* Hostname */ char *clientid; /* Client ID or DUID */ int type; /* virIPAddrType */ unsigned int prefix; /* IP address prefix */ }; Since no one likes the idea of having a union, but we do want to support dhcpv6, following is the new design: struct _virNetworkDHCPLeases { char *interface; /* Network interface name (non-null) */ long long expirytime; /* Seconds since epoch (non-null) */ int type; /* virIPAddrType (non-null) */ unsigned int prefix; /* IP address prefix (non-null) */ char *mac; /* MAC address (mostly non-null, except rare cases) */ char *iaid; /* IAID (ipv6) (null, in case of ipv4) */ char *ipaddr; /* IP address (non-null) */ char *hostname; /* Hostname (can be null) */ char *clientid; /* Client ID(ipv4) or DUID(ipv6) (can be null, in case of ipv4) */ }; -- Nehal J Wani

3 5

[libvirt] [PATCH] rpc: Correct the wrong payload size checking
by Osier Yang 15 Oct '13

15 Oct '13

<...> /* Size of message length field. Not counted in VIR_NET_MESSAGE_MAX * and VIR_NET_MESSAGE_INITIAL. */ const VIR_NET_MESSAGE_LEN_MAX = 4; </...> However, msg->bufferLength includes the length word. The wrong checking was introduced by commit e914dcfd. * src/rpc/virnetmessage.c: - Correct the checking in virNetMessageEncodePayloadRaw - Use a new variable to track the new payload length in virNetMessageEncodePayloadRaw --- src/rpc/virnetmessage.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index 8f4e4bc..4c60424 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -346,15 +346,17 @@ int virNetMessageEncodePayload(virNetMessagePtr msg, /* Try to encode the payload. If the buffer is too small increase it. */ while (!(*filter)(&xdr, data)) { - if ((msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4 > VIR_NET_MESSAGE_MAX) { + unsigned int newlen = (msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4 + + VIR_NET_MESSAGE_LEN_MAX; + + if (newlen > VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX) { virReportError(VIR_ERR_RPC, "%s", _("Unable to encode message payload")); goto error; } xdr_destroy(&xdr); - msg->bufferLength = (msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4 + - VIR_NET_MESSAGE_LEN_MAX; + msg->bufferLength = newlen; if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) goto error; @@ -426,10 +428,15 @@ int virNetMessageEncodePayloadRaw(virNetMessagePtr msg, /* If the message buffer is too small for the payload increase it accordingly. */ if ((msg->bufferLength - msg->bufferOffset) < len) { - if ((msg->bufferOffset + len) > VIR_NET_MESSAGE_MAX) { + if ((msg->bufferOffset + len) > + VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX) { virReportError(VIR_ERR_RPC, - _("Stream data too long to send (%zu bytes needed, %zu bytes available)"), - len, (VIR_NET_MESSAGE_MAX - msg->bufferOffset)); + _("Stream data too long to send " + "(%zu bytes needed, %zu bytes available)"), + len, + VIR_NET_MESSAGE_MAX + + VIR_NET_MESSAGE_LEN_MAX - + msg->bufferOffset); return -1; } -- 1.8.1.4

2 3