Page MenuHomeFreeBSD
Differential D24929

vmm(4): Add 12 user ABI compat after r349948
ClosedPublic
Actions

Authored by cem on May 20 2020, 4:09 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 7, 11:32 PM
Unknown Object (File)
Feb 26 2025, 1:53 AM
Unknown Object (File)
Feb 18 2025, 7:48 PM
Unknown Object (File)
Feb 7 2025, 2:30 AM
Unknown Object (File)
Jan 13 2025, 12:05 PM
Unknown Object (File)
Jan 13 2025, 12:06 AM
Unknown Object (File)
Jan 9 2025, 7:41 AM
Unknown Object (File)
Jan 2 2025, 3:28 AM
View All 49 Files
Subscribers
bcran
imp
kp
rgrimes

Details

Reviewers
grehan
scottl
jhb
kp
Group Reviewers
bhyve
Commits
rS361284: vmm(4): Add 12 user ABI compat after r349948

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

cem created this revision.May 20 2020, 4:09 PM
Herald added a reviewer: bhyve. · View Herald TranscriptMay 20 2020, 4:09 PM
Herald added subscribers: bcran, rgrimes. · View Herald Transcript
cem requested review of this revision.May 20 2020, 4:09 PM
Harbormaster completed remote builds in B31199: Diff 72031.May 20 2020, 4:09 PM
jhb accepted this revision.May 20 2020, 4:15 PM
jhb added a subscriber: kp.

Would be good if @kp could confirm this works in testing first.

This revision is now accepted and ready to land.May 20 2020, 4:15 PM
kp accepted this revision.May 20 2020, 5:23 PM

Yeah, with these changes my CURRENT kernel / 12.1 user land machine starts bhyve just fine.

Closed by commit rS361284: vmm(4): Add 12 user ABI compat after r349948 (authored by cem). · Explain WhyMay 20 2020, 5:28 PM
This revision was automatically updated to reflect the committed changes.
cem added a commit: rS361284: vmm(4): Add 12 user ABI compat after r349948.
Herald added a subscriber: imp. · View Herald TranscriptMay 20 2020, 5:28 PM

Revision Contents
Changeset List

PathSize
head/
sys/
amd64/
include/
11 lines
vmm/
37 lines

Diff 72035

View Options

head/sys/amd64/include/vmm_dev.h

Show All 14 Lines
# #
# This replaces the old pattern: # This replaces the old pattern:
# @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi # @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
# etc/pkgtools.conf.sample # etc/pkgtools.conf.sample
# @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf # @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf
actions: [file(1)] actions: [file(1)]
arguments: true arguments: true
post-install: <<EOD post-install-lua: <<EOS
case "%1" in sample_file = pkg.prefixed_path("%1", "%D")
/*) sample_file="%1" ;; _,n = string.gsub("%@", "%S+","")
*) sample_file="%D/%1" ;; if n == 2 then
esac target_file = pkg.prefixed_path("%1", "%D")
target_file="${sample_file%.sample}"
set -- %@
if [ $# -eq 2 ]; then
target_file=${2}
fi
case "${target_file}" in
/*) target_file="${target_file}" ;;
*) target_file="%D/${target_file}" ;;
esac
if ! [ -f "${target_file}" ]; then
/bin/cp -p "${sample_file}" "${target_file}"
fi
EOD
pre-deinstall: <<EOD
case "%1" in
/*) sample_file="%1" ;;
*) sample_file="%D/%1" ;;
esac
target_file="${sample_file%.sample}"
set -- %@
if [ $# -eq 2 ]; then
set -- %@
target_file=${2}
fi
case "${target_file}" in
/*) target_file="${target_file}" ;;
*) target_file="%D/${target_file}" ;;
esac
if cmp -s "${target_file}" "${sample_file}"; then
rm -f "${target_file}"
else else
echo "You may need to manually remove ${target_file} if it is no longer needed." target_file = string.gsub(sample_file,'%.sample$', "")
fi end
EOD outh = io.open(target_file, "r")
matUnsubmitted
Done
Inline Actions

There is so much magic going on here.

What is %@ ? What is %S+ ? I looked at pkg-lua-script(5) and it does not appear in it.

mat: There is so much magic going on here. What is `%@` ? What is `%S+` ? I looked at pkg-lua…
manuUnsubmitted
Done
Inline Actions

I copied the gsub from the old review but a simple test on %# will be enough. I'll update the code.

manu: I copied the gsub from the old review but a simple test on %# will be enough. I'll update the…
if outh ~= nil then
io.close(outh)
return
end
outh = io.open(target_file, "w+")
for line in io.lines(sample_file) do
outh:write(line, "\n")
end
matUnsubmitted
Done
Inline Actions

This is not what the script was doing before.

The script copies the .sample to the destination file if the destination file does not exist. There is absolutely no comparison involved. There should be a pkg.fileexists or something.

mat: This is not what the script was doing before. The script copies the .sample to the destination…
manuUnsubmitted
Done
Inline Actions

This is exactly what it does too.
Sure there is a "useless" cmp, I can see to add a fileexist (or use of the lua os. function maybe)

manu: This is exactly what it does too. Sure there is a "useless" cmp, I can see to add a fileexist…
io.close(outh)
EOS
pre-deinstall-lua: <<EOS
sample_file = pkg.prefixed_path("%1")
_,n = string.gsub("%@", "%S+","")
if n == 2 then
target_file = pkg.prefixed_path("%1")
else
target_file = string.gsub(sample_file, '%.sample$', "")
end
outh = io.open(target_file, "r")
inh = io.open(sample_file, "r")
sizeout = outh:seek("end")
sizein = inh:seek("end")
if sizeout ~= sizein then
pkg.print_msg("You may need to manually remove " .. target_file .. " if it is no longer needed.")
return
end
inh:seek("set", 0)
outh:seek("set", 0)
linein = inh:read("l")
lineout = outh:read("l")
while (linein == lineout and linein ~= nil and lineout ~= nil) do
linein = inh:read("l")
lineout = outh:read("l")
end
io.close(inh)
io.close(outh)
if linein == lineout then
os.remove(target_file)
else
pkg.print_msg("You may need to manually remove " .. target_file .. " if it is no longer needed.")
end
EOS
View Options

head/sys/amd64/vmm/vmm_dev.c

Show All 14 Lines
# #
# This replaces the old pattern: # This replaces the old pattern:
# @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi # @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
# etc/pkgtools.conf.sample # etc/pkgtools.conf.sample
# @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf # @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf
actions: [file(1)] actions: [file(1)]
arguments: true arguments: true
post-install: <<EOD post-install-lua: <<EOS
case "%1" in sample_file = pkg.prefixed_path("%1", "%D")
/*) sample_file="%1" ;; _,n = string.gsub("%@", "%S+","")
*) sample_file="%D/%1" ;; if n == 2 then
esac target_file = pkg.prefixed_path("%1", "%D")
target_file="${sample_file%.sample}"
set -- %@
if [ $# -eq 2 ]; then
target_file=${2}
fi
case "${target_file}" in
/*) target_file="${target_file}" ;;
*) target_file="%D/${target_file}" ;;
esac
if ! [ -f "${target_file}" ]; then
/bin/cp -p "${sample_file}" "${target_file}"
fi
EOD
pre-deinstall: <<EOD
case "%1" in
/*) sample_file="%1" ;;
*) sample_file="%D/%1" ;;
esac
target_file="${sample_file%.sample}"
set -- %@
if [ $# -eq 2 ]; then
set -- %@
target_file=${2}
fi
case "${target_file}" in
/*) target_file="${target_file}" ;;
*) target_file="%D/${target_file}" ;;
esac
if cmp -s "${target_file}" "${sample_file}"; then
rm -f "${target_file}"
else else
echo "You may need to manually remove ${target_file} if it is no longer needed." target_file = string.gsub(sample_file,'%.sample$', "")
fi end
EOD outh = io.open(target_file, "r")
matUnsubmitted
Done
Inline Actions

There is so much magic going on here.

What is %@ ? What is %S+ ? I looked at pkg-lua-script(5) and it does not appear in it.

mat: There is so much magic going on here. What is `%@` ? What is `%S+` ? I looked at pkg-lua…
manuUnsubmitted
Done
Inline Actions

I copied the gsub from the old review but a simple test on %# will be enough. I'll update the code.

manu: I copied the gsub from the old review but a simple test on %# will be enough. I'll update the…
if outh ~= nil then
io.close(outh)
return
end
outh = io.open(target_file, "w+")
for line in io.lines(sample_file) do
outh:write(line, "\n")
end
matUnsubmitted
Done
Inline Actions

This is not what the script was doing before.

The script copies the .sample to the destination file if the destination file does not exist. There is absolutely no comparison involved. There should be a pkg.fileexists or something.

mat: This is not what the script was doing before. The script copies the .sample to the destination…
manuUnsubmitted
Done
Inline Actions

This is exactly what it does too.
Sure there is a "useless" cmp, I can see to add a fileexist (or use of the lua os. function maybe)

manu: This is exactly what it does too. Sure there is a "useless" cmp, I can see to add a fileexist…
io.close(outh)
EOS
pre-deinstall-lua: <<EOS
sample_file = pkg.prefixed_path("%1")
_,n = string.gsub("%@", "%S+","")
if n == 2 then
target_file = pkg.prefixed_path("%1")
else
target_file = string.gsub(sample_file, '%.sample$', "")
end
outh = io.open(target_file, "r")
inh = io.open(sample_file, "r")
sizeout = outh:seek("end")
sizein = inh:seek("end")
if sizeout ~= sizein then
pkg.print_msg("You may need to manually remove " .. target_file .. " if it is no longer needed.")
return
end
inh:seek("set", 0)
outh:seek("set", 0)
linein = inh:read("l")
lineout = outh:read("l")
while (linein == lineout and linein ~= nil and lineout ~= nil) do
linein = inh:read("l")
lineout = outh:read("l")
end
io.close(inh)
io.close(outh)
if linein == lineout then
os.remove(target_file)
else
pkg.print_msg("You may need to manually remove " .. target_file .. " if it is no longer needed.")
end
EOS