<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=US-ASCII" http-equiv="Content-Type"> <title> GitLab </title> <style>img { max-width: 100%; height: auto; } </style> </head> <body> <div class="content"> <h3> Samuel Thibault pushed to branch master at <a href="https://gitlab.freedesktop.org/slirp/libslirp">slirp / libslirp</a> </h3> <h4> Commits: </h4> <ul> <li> <strong><a href="https://gitlab.freedesktop.org/slirp/libslirp/-/commit/b3caf2ca6fc82cba0479fe3b46c3da95bbeaaec9">b3caf2ca</a></strong> <div> <span>by Dr. David Alan Gilbert</span> <i>at 2022-02-02T11:23:28+00:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Add VMS_END marker The migration VMSTATE_END_OF_LIST marker relies on a NULL field to mark th eend of a list; that's a bit delicate when the marker is forgotten and the code hits a NULL by luck. Use an explicit flag to mark the end as well. See: https://lists.gnu.org/archive/html/qemu-devel/2022-01/msg03025.html Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> </pre> </li> <li> <strong><a href="https://gitlab.freedesktop.org/slirp/libslirp/-/commit/2492fc3f55e8e3ac88dd20c3244343e272918545">2492fc3f</a></strong> <div> <span>by Samuel Thibault</span> <i>at 2022-02-02T11:58:14+00:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Merge branch 'libslirp-vmsend' into 'master' Add VMS_END marker See merge request slirp/libslirp!112</pre> </li> </ul> <h4>1 changed file:</h4> <ul> <li class="file-stats"> <a href="#d76c580792c77909ba8918e27105cc65fd207c54"> src/vmstate.h </a> </li> </ul> <h4>Changes:</h4> <li id="d76c580792c77909ba8918e27105cc65fd207c54"> <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/compare/04fc0b03f0b109fc1ba61348163e3e0b1fea09fe...2492fc3f55e8e3ac88dd20c3244343e272918545#d76c580792c77909ba8918e27105cc65fd207c54"><strong>src/vmstate.h</strong></a> <hr> <table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0"> <tr class="line_holder match" id="" style="line-height: 1.6;"> <td class="diff-line-num unfold js-unfold old_line" data-linenumber="173" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="diff-line-num unfold js-unfold new_line" data-linenumber="173" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="line_content match" style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -173,6 +173,9 @@ enum VMStateFlags {</td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="173" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 173 </td> <td class="new_line diff-line-num" data-linenumber="173" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 173 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> <span id="LC173" class="line" lang="c"><span class="cm" style="color: #998; font-style: italic;"> * VMStateField.struct_version_id to tell which version of the</span></span> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="174" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 174 </td> <td class="new_line diff-line-num" data-linenumber="174" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 174 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> <span id="LC174" class="line" lang="c"><span class="cm" style="color: #998; font-style: italic;"> * structure we are referencing to use. */</span></span> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="175" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 175 </td> <td class="new_line diff-line-num" data-linenumber="175" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 175 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> <span id="LC175" class="line" lang="c"> <span class="n" style="color: #333;">VMS_VSTRUCT</span> <span class="o" style="font-weight: 600;">=</span> <span class="mh" style="color: #099;">0x8000</span><span class="p">,</span></span> </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="176" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="176" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 176 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+<span id="LC176" class="line" lang="c"></span> </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="176" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="177" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 177 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+<span id="LC177" class="line" lang="c"> <span class="cm" style="color: #998; font-style: italic;">/* Marker for end of list */</span></span> </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="176" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="178" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 178 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+<span id="LC178" class="line" lang="c"> <span class="n" style="color: #333;">VMS_END</span> <span class="o" style="font-weight: 600;">=</span> <span class="mh" style="color: #099;">0x10000</span></span> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="176" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 176 </td> <td class="new_line diff-line-num" data-linenumber="179" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 179 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> <span id="LC179" class="line" lang="c"><span class="p">};</span></span> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="177" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 177 </td> <td class="new_line diff-line-num" data-linenumber="180" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 180 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> <span id="LC180" class="line" lang="c"></span> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="178" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 178 </td> <td class="new_line diff-line-num" data-linenumber="181" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 181 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> <span id="LC181" class="line" lang="c"><span class="k" style="font-weight: 600;">struct</span> <span class="n" style="color: #333;">VMStateField</span> <span class="p">{</span></span> </pre> </td> </tr> <tr class="line_holder match" id="" style="line-height: 1.6;"> <td class="diff-line-num unfold js-unfold old_line" data-linenumber="386" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="diff-line-num unfold js-unfold new_line" data-linenumber="389" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="line_content match" style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -386,6 +389,7 @@ extern const VMStateInfo slirp_vmstate_info_tmp;</td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="386" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 386 </td> <td class="new_line diff-line-num" data-linenumber="389" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 389 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> <span id="LC389" class="line" lang="c"></span> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="387" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 387 </td> <td class="new_line diff-line-num" data-linenumber="390" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 390 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> <span id="LC390" class="line" lang="c"><span class="cp" style="color: #999; font-weight: 600;">#define VMSTATE_END_OF_LIST() \</span></span> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="388" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 388 </td> <td class="new_line diff-line-num" data-linenumber="391" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 391 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> <span id="LC391" class="line" lang="c"><span class="cp" style="color: #999; font-weight: 600;"> { \</span></span> </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="389" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="392" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 392 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+<span id="LC392" class="line" lang="c"><span class="cp" style="color: #999; font-weight: 600;"> .flags = VMS_END, \</span></span> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="389" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 389 </td> <td class="new_line diff-line-num" data-linenumber="393" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 393 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> <span id="LC393" class="line" lang="c"><span class="cp" style="color: #999; font-weight: 600;"> }</span></span> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="390" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 390 </td> <td class="new_line diff-line-num" data-linenumber="394" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 394 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> <span id="LC394" class="line" lang="c"></span> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="391" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 391 </td> <td class="new_line diff-line-num" data-linenumber="395" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 395 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> <span id="LC395" class="line" lang="c"><span class="cp" style="color: #999; font-weight: 600;">#endif</span></span></pre> </td> </tr> </table> <br> </li> </div> <div class="footer" style="margin-top: 10px;"> <p style="font-size: small; color: #666;"> — <br> <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/compare/04fc0b03f0b109fc1ba61348163e3e0b1fea09fe...2492fc3f55e8e3ac88dd20c3244343e272918545">View it on GitLab</a>. <br> You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings. </p> </div> </body> </html>