Skip to content

suppress gcc error on arch, block device compatible ( /dev/xxx) and let sdl gui works in pure wayland #64

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

suppress gcc error on arch, block device compatible ( /dev/xxx) and let sdl gui works in pure wayland #64

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7115fc4
suppress gcc error on arch, blockdevice compatible ( /dev/xxx) and le…
limbo127 Oct 29, 2024
e06b213
must qui when acpi receive acpi
limbo127 Oct 29, 2024
c120cab
update KVM flag to latest kernel
limbo127 Oct 31, 2024
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
18 changes: 12 additions & 6 deletions images/raw.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
#include <unistd.h>
#include <sys/stat.h>
#include <filesystem>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <linux/fs.h>


#include "logger.h"
#include "device_manager.h"
Expand Down Expand Up @@ -59,15 +63,17 @@ class RawImage : public DiskImage {
std::filesystem::copy_file(filepath_, temp, std::filesystem::copy_options::overwrite_existing);
filepath_ = temp;
}

fd_ = open(filepath_.c_str(), oflags);
if (fd_ < 0)
MV_PANIC("disk file not found: %s", filepath_.c_str());

struct stat st;
fstat(fd_, &st);
block_size_ = 512;
total_blocks_ = st.st_size / block_size_;
long long size_blockdevice;
if(ioctl(fd_,BLKGETSIZE64,&size_blockdevice)!=-1) {
total_blocks_ = size_blockdevice / block_size_;
block_size_ = 512;
total_blocks_ = size_blockdevice / block_size_;
Copy link
Collaborator

@nooodles2023 nooodles2023 Nov 2, 2024

Choose a reason for hiding this comment

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

duplicated code？

} else {
MV_PANIC("ioctl failed");
}
}

long HandleIoRequest(const ImageIoRequest& request) {
Expand Down
3 changes: 2 additions & 1 deletion main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ int main(int argc, char* argv[]) {
}

const char* displayVar = std::getenv("DISPLAY");
if (displayVar == nullptr) {
const char* waylandVar = std::getenv("WAYLAND_DISPLAY");
if (displayVar == nullptr && waylandVar == nullptr) {
if (vnc_port == 0) {
vnc_port = 5901;
}
Expand Down
2 changes: 0 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ project('mvisor', 'c', 'cpp',
license: 'GPLv3',
default_options: [
'buildtype=debugoptimized',
'warning_level=2',
'cpp_std=c++17',
'werror=true'
]
)

Expand Down