Skip to content

[ppc64le] Remove P8 and P9 hack so tests pass for Power10 #3887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ravanelli merged 1 commit into from
Oct 22, 2024
Merged

[ppc64le] Remove P8 and P9 hack so tests pass for Power10 #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions mantle/platform/qemu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ import (
"github.com/coreos/coreos-assembler/mantle/system"
"github.com/coreos/coreos-assembler/mantle/system/exec"
"github.com/pkg/errors"

"golang.org/x/sys/unix"
Copy link
Member

@ravanelli ravanelli Oct 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be part of the first commit, squash the commits to have only one commit.

)

var (
Expand Down Expand Up @@ -859,19 +857,6 @@ func newGuestfish(arch, diskImagePath string, diskSectorSize int) (*coreosGuestf
cmd := exec.Command("guestfish", guestfishArgs...)
cmd.Env = append(os.Environ(), "LIBGUESTFS_BACKEND=direct")

// Hack to run with a wrapper on older P8 hardware running RHEL7
switch arch {
case "ppc64le":
u := unix.Utsname{}
if err := unix.Uname(&u); err != nil {
return nil, errors.Wrapf(err, "detecting kernel information")
}
if strings.Contains(fmt.Sprintf("%s", u.Release), "el7") {
plog.Infof("Detected el7. Running using libguestfs-ppc64le-wrapper.sh")
cmd.Env = append(cmd.Env, "LIBGUESTFS_HV=/usr/lib/coreos-assembler/libguestfs-ppc64le-wrapper.sh")
}
}

// make sure it inherits stderr so we see any error message
cmd.Stderr = os.Stderr
stdout, err := cmd.StdoutPipe()
Expand Down
8 changes: 0 additions & 8 deletions src/libguestfish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ export LIBGUESTFS_BACKEND=direct

arch=$(uname -m)


# Hack to run with a wrapper on older P8 hardware running RHEL7
if [ "$arch" = "ppc64le" ] ; then
if [[ "$(uname -r)" =~ "el7" ]]; then
export LIBGUESTFS_HV="/usr/lib/coreos-assembler/libguestfs-ppc64le-wrapper.sh"
fi
fi

# Hack to give ppc64le more memory inside the libguestfs VM.
# The compiled in default I see when running `guestfish get-memsize`
# is 1280. We need this because we are seeing issues from
Expand Down
2 changes: 0 additions & 2 deletions src/libguestfs-ppc64le-wrapper.sh
View file
Open in desktop

This file was deleted.

Loading