On Tue, Apr 29, 2014 at 4:00 AM, Eric Blake wrote:
> On 04/25/2014 04:11 PM, Fedor Lyakhov wrote:
>> Signed-off-by: Fedor Lyakhov
>> ---
>> qemu-options.hx | 16 +---
>> 1 file changed, 13 insertions(+), 3 deletions(-)
>
>> +"
Yes, sure. No problem.
On Tue, Apr 29, 2014 at 3:56 AM, Eric Blake wrote:
> On 04/25/2014 04:11 PM, Fedor Lyakhov wrote:
>> New module dhcp_vendopt.c provides translate_dhcp_vendopt() function to
>> convert
>> command-line DHCP vendor option string into internal DHCP TLV
Signed-off-by: Fedor Lyakhov
---
qemu-options.hx | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 6457034..8be86e1 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1373,10 +1373,10 @@ DEF("net"
New command-line suboption "[,dhcpvendopt=optstring]" is defined in the
qapi-schema.json. If supplied, the optstring is passed to SLIRP initialization.
Signed-off-by: Fedor Lyakhov
---
net/slirp.c | 9 +
qapi-schema.json | 3 +++
slirp/libslirp.h | 3 ++-
slirp/slirp.c
:
- bootp_defines.h contains only plain protocol defines
- bootp.h (includes bootp_defines.h) contains everything else used in bootp.c
Common BOOTP/DHCP defines are used in slirp/dnssearch.c instead of local ones.
Signed-off-by: Fedor Lyakhov
---
slirp/bootp.h | 95
Signed-off-by: Fedor Lyakhov
---
tests/Makefile| 3 +
tests/test-dhcp-vendopt.c | 203 ++
2 files changed, 206 insertions(+)
create mode 100644 tests/test-dhcp-vendopt.c
diff --git a/tests/Makefile b/tests/Makefile
index 88f7105
Signed-off-by: Fedor Lyakhov
---
slirp/debug.h | 5 +
1 file changed, 5 insertions(+)
diff --git a/slirp/debug.h b/slirp/debug.h
index 6cfa61e..84754d4 100644
--- a/slirp/debug.h
+++ b/slirp/debug.h
@@ -5,6 +5,9 @@
* terms and conditions of the copyright.
*/
+#ifndef SLIRP_DEBUG_H
Signed-off-by: Fedor Lyakhov
---
slirp/bootp.c | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/slirp/bootp.c b/slirp/bootp.c
index b7db9fa..df8d527 100644
--- a/slirp/bootp.c
+++ b/slirp/bootp.c
@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE
ported by gcov.
3. checkpatch.pl reports no errors. There is a number of warnings "line over 80
characters"
for test-dhcp-vendopt.c which are excusable (long test data; but the number can
be decreased)
This is my first patch to QEMU, sorry if I've missed something. I'll try to
New module dhcp_vendopt.c provides translate_dhcp_vendopt() function to convert
command-line DHCP vendor option string into internal DHCP TLV (tag-length-
value) uint8_t buffer. The buffer is stored in global Slirp instance.
Signed-off-by: Fedor Lyakhov
---
slirp/Makefile.objs | 1 +
slirp
10 matches
Mail list logo