* [PATCH v3 1/4] cutils: Introduce bundle mechanism
2022-02-28 0:57 [PATCH v3 0/4] cutils: Introduce bundle mechanism Akihiko Odaki
@ 2022-02-28 0:57 ` Akihiko Odaki
2022-02-28 0:57 ` [PATCH] ui/cocoa: Use the standard about panel Akihiko Odaki
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Akihiko Odaki @ 2022-02-28 0:57 UTC (permalink / raw)
Cc: Peter Maydell, Jason Wang, qemu-devel, Programmingkid,
Philippe Mathieu-Daudé, Gerd Hoffmann, Akihiko Odaki
Developers often run QEMU without installing. The bundle mechanism
allows to look up files which should be present in installation even in
such a situation.
It is a general mechanism and can find any files located relative
to the installation tree. The build tree must have a new directory,
qemu-bundle, to represent what files the installation tree would
have for reference by the executables.
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
include/qemu/cutils.h | 19 +++++++++++++++++++
util/cutils.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h
index 320543950c4..98ff59e38e3 100644
--- a/include/qemu/cutils.h
+++ b/include/qemu/cutils.h
@@ -209,6 +209,25 @@ int qemu_pstrcmp0(const char **str1, const char **str2);
*/
char *get_relocated_path(const char *dir);
+/**
+ * find_bundle:
+ * @path: Relative path
+ *
+ * Returns a path for the specified directory or file bundled in QEMU. It uses
+ * the directory of the running executable as the prefix first. See
+ * get_relocated_path() for the details. The next candidate is "qemu-bundle"
+ * directory in the directory of the running executable. "qemu-bundle"
+ * directory is typically present in the build tree.
+ *
+ * The returned string should be freed by the caller.
+ *
+ * Returns: a path that can access the bundle, or NULL if no matching bundle
+ * exists.
+ */
+char *find_bundle(const char *path);
+
+void list_bundle_candidates(const char *path);
+
static inline const char *yes_no(bool b)
{
return b ? "yes" : "no";
diff --git a/util/cutils.c b/util/cutils.c
index c9b91e7535a..b4e4cda71c8 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -1057,3 +1057,36 @@ char *get_relocated_path(const char *dir)
}
return g_string_free(result, false);
}
+
+static const char * const bundle_formats[] = {
+ "%s" G_DIR_SEPARATOR_S ".." G_DIR_SEPARATOR_S "%s",
+ "%s" G_DIR_SEPARATOR_S "qemu-bundle" G_DIR_SEPARATOR_S "%s"
+};
+
+char *find_bundle(const char *path)
+{
+ const char *dir = qemu_get_exec_dir();
+ char *candidate;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(bundle_formats); i++) {
+ candidate = g_strdup_printf(bundle_formats[i], dir, path);
+ if (access(candidate, R_OK) == 0) {
+ return candidate;
+ }
+ g_free(candidate);
+ }
+
+ return NULL;
+}
+
+void list_bundle_candidates(const char *path)
+{
+ const char *dir = qemu_get_exec_dir();
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(bundle_formats); i++) {
+ printf(bundle_formats[i], dir, path);
+ putc('\n', stdout);
+ }
+}
--
2.32.0 (Apple Git-132)
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH] ui/cocoa: Use the standard about panel
2022-02-28 0:57 [PATCH v3 0/4] cutils: Introduce bundle mechanism Akihiko Odaki
2022-02-28 0:57 ` [PATCH v3 1/4] " Akihiko Odaki
@ 2022-02-28 0:57 ` Akihiko Odaki
2022-02-28 1:01 ` Akihiko Odaki
2022-02-28 0:57 ` [PATCH v3 2/4] datadir: Use bundle mechanism Akihiko Odaki
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Akihiko Odaki @ 2022-02-28 0:57 UTC (permalink / raw)
Cc: Peter Maydell, Jason Wang, qemu-devel, Programmingkid,
Philippe Mathieu-Daudé, Gerd Hoffmann, Akihiko Odaki
This provides standard look and feel for the about panel and reduces
code.
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
ui/cocoa.m | 112 +++++++++++------------------------------------------
1 file changed, 23 insertions(+), 89 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index a8f1cdaf926..59672fee775 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -83,7 +83,7 @@ static void cocoa_switch(DisplayChangeListener *dcl,
static void cocoa_refresh(DisplayChangeListener *dcl);
-static NSWindow *normalWindow, *about_window;
+static NSWindow *normalWindow;
static const DisplayChangeListenerOps dcl_ops = {
.dpy_name = "cocoa",
.dpy_gfx_update = cocoa_update,
@@ -1120,7 +1120,6 @@ - (void)changeDeviceMedia:(id)sender;
- (BOOL)verifyQuit;
- (void)openDocumentation:(NSString *)filename;
- (IBAction) do_about_menu_item: (id) sender;
-- (void)make_about_window;
- (void)adjustSpeed:(id)sender;
@end
@@ -1166,8 +1165,6 @@ - (id) init
[pauseLabel setFont: [NSFont fontWithName: @"Helvetica" size: 90]];
[pauseLabel setTextColor: [NSColor blackColor]];
[pauseLabel sizeToFit];
-
- [self make_about_window];
}
return self;
}
@@ -1451,92 +1448,29 @@ - (BOOL)verifyQuit
/* The action method for the About menu item */
- (IBAction) do_about_menu_item: (id) sender
{
- [about_window makeKeyAndOrderFront: nil];
-}
-
-/* Create and display the about dialog */
-- (void)make_about_window
-{
- /* Make the window */
- int x = 0, y = 0, about_width = 400, about_height = 200;
- NSRect window_rect = NSMakeRect(x, y, about_width, about_height);
- about_window = [[NSWindow alloc] initWithContentRect:window_rect
- styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
- NSWindowStyleMaskMiniaturizable
- backing:NSBackingStoreBuffered
- defer:NO];
- [about_window setTitle: @"About"];
- [about_window setReleasedWhenClosed: NO];
- [about_window center];
- NSView *superView = [about_window contentView];
-
- /* Create the dimensions of the picture */
- int picture_width = 80, picture_height = 80;
- x = (about_width - picture_width)/2;
- y = about_height - picture_height - 10;
- NSRect picture_rect = NSMakeRect(x, y, picture_width, picture_height);
-
- /* Make the picture of QEMU */
- NSImageView *picture_view = [[NSImageView alloc] initWithFrame:
- picture_rect];
- char *qemu_image_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png");
- NSString *qemu_image_path = [NSString stringWithUTF8String:qemu_image_path_c];
- g_free(qemu_image_path_c);
- NSImage *qemu_image = [[NSImage alloc] initWithContentsOfFile:qemu_image_path];
- [picture_view setImage: qemu_image];
- [picture_view setImageScaling: NSImageScaleProportionallyUpOrDown];
- [superView addSubview: picture_view];
-
- /* Make the name label */
- NSBundle *bundle = [NSBundle mainBundle];
- if (bundle) {
- x = 0;
- y = y - 25;
- int name_width = about_width, name_height = 20;
- NSRect name_rect = NSMakeRect(x, y, name_width, name_height);
- NSTextField *name_label = [[NSTextField alloc] initWithFrame: name_rect];
- [name_label setEditable: NO];
- [name_label setBezeled: NO];
- [name_label setDrawsBackground: NO];
- [name_label setAlignment: NSTextAlignmentCenter];
- NSString *qemu_name = [[bundle executablePath] lastPathComponent];
- [name_label setStringValue: qemu_name];
- [superView addSubview: name_label];
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ char *icon_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png");
+ NSString *icon_path = [NSString stringWithUTF8String:icon_path_c];
+ g_free(icon_path_c);
+ NSImage *icon = [[NSImage alloc] initWithContentsOfFile:icon_path];
+ NSString *version = @"QEMU emulator version " QEMU_FULL_VERSION;
+ NSString *copyright = @QEMU_COPYRIGHT;
+ NSDictionary *options;
+ if (icon) {
+ options = @{
+ NSAboutPanelOptionApplicationIcon : icon,
+ NSAboutPanelOptionApplicationVersion : version,
+ @"Copyright" : copyright,
+ };
+ [icon release];
+ } else {
+ options = @{
+ NSAboutPanelOptionApplicationVersion : version,
+ @"Copyright" : copyright,
+ };
}
-
- /* Set the version label's attributes */
- x = 0;
- y = 50;
- int version_width = about_width, version_height = 20;
- NSRect version_rect = NSMakeRect(x, y, version_width, version_height);
- NSTextField *version_label = [[NSTextField alloc] initWithFrame:
- version_rect];
- [version_label setEditable: NO];
- [version_label setBezeled: NO];
- [version_label setAlignment: NSTextAlignmentCenter];
- [version_label setDrawsBackground: NO];
-
- /* Create the version string*/
- NSString *version_string;
- version_string = [[NSString alloc] initWithFormat:
- @"QEMU emulator version %s", QEMU_FULL_VERSION];
- [version_label setStringValue: version_string];
- [superView addSubview: version_label];
-
- /* Make copyright label */
- x = 0;
- y = 35;
- int copyright_width = about_width, copyright_height = 20;
- NSRect copyright_rect = NSMakeRect(x, y, copyright_width, copyright_height);
- NSTextField *copyright_label = [[NSTextField alloc] initWithFrame:
- copyright_rect];
- [copyright_label setEditable: NO];
- [copyright_label setBezeled: NO];
- [copyright_label setDrawsBackground: NO];
- [copyright_label setAlignment: NSTextAlignmentCenter];
- [copyright_label setStringValue: [NSString stringWithFormat: @"%s",
- QEMU_COPYRIGHT]];
- [superView addSubview: copyright_label];
+ [NSApp orderFrontStandardAboutPanelWithOptions:options];
+ [pool release];
}
/* Used by the Speed menu items */
--
2.32.0 (Apple Git-132)
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] ui/cocoa: Use the standard about panel
2022-02-28 0:57 ` [PATCH] ui/cocoa: Use the standard about panel Akihiko Odaki
@ 2022-02-28 1:01 ` Akihiko Odaki
0 siblings, 0 replies; 8+ messages in thread
From: Akihiko Odaki @ 2022-02-28 1:01 UTC (permalink / raw)
Cc: Peter Maydell, Jason Wang, qemu-devel, Programmingkid,
Philippe Mathieu-Daudé, Gerd Hoffmann
Please ignore this. I mistakenly sent a stale patch in my outbox
directory. Sorry for bothering,
Akihiko Odaki
On 2022/02/28 9:57, Akihiko Odaki wrote:
> This provides standard look and feel for the about panel and reduces
> code.
>
> Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
> ---
> ui/cocoa.m | 112 +++++++++++------------------------------------------
> 1 file changed, 23 insertions(+), 89 deletions(-)
>
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index a8f1cdaf926..59672fee775 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -83,7 +83,7 @@ static void cocoa_switch(DisplayChangeListener *dcl,
>
> static void cocoa_refresh(DisplayChangeListener *dcl);
>
> -static NSWindow *normalWindow, *about_window;
> +static NSWindow *normalWindow;
> static const DisplayChangeListenerOps dcl_ops = {
> .dpy_name = "cocoa",
> .dpy_gfx_update = cocoa_update,
> @@ -1120,7 +1120,6 @@ - (void)changeDeviceMedia:(id)sender;
> - (BOOL)verifyQuit;
> - (void)openDocumentation:(NSString *)filename;
> - (IBAction) do_about_menu_item: (id) sender;
> -- (void)make_about_window;
> - (void)adjustSpeed:(id)sender;
> @end
>
> @@ -1166,8 +1165,6 @@ - (id) init
> [pauseLabel setFont: [NSFont fontWithName: @"Helvetica" size: 90]];
> [pauseLabel setTextColor: [NSColor blackColor]];
> [pauseLabel sizeToFit];
> -
> - [self make_about_window];
> }
> return self;
> }
> @@ -1451,92 +1448,29 @@ - (BOOL)verifyQuit
> /* The action method for the About menu item */
> - (IBAction) do_about_menu_item: (id) sender
> {
> - [about_window makeKeyAndOrderFront: nil];
> -}
> -
> -/* Create and display the about dialog */
> -- (void)make_about_window
> -{
> - /* Make the window */
> - int x = 0, y = 0, about_width = 400, about_height = 200;
> - NSRect window_rect = NSMakeRect(x, y, about_width, about_height);
> - about_window = [[NSWindow alloc] initWithContentRect:window_rect
> - styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
> - NSWindowStyleMaskMiniaturizable
> - backing:NSBackingStoreBuffered
> - defer:NO];
> - [about_window setTitle: @"About"];
> - [about_window setReleasedWhenClosed: NO];
> - [about_window center];
> - NSView *superView = [about_window contentView];
> -
> - /* Create the dimensions of the picture */
> - int picture_width = 80, picture_height = 80;
> - x = (about_width - picture_width)/2;
> - y = about_height - picture_height - 10;
> - NSRect picture_rect = NSMakeRect(x, y, picture_width, picture_height);
> -
> - /* Make the picture of QEMU */
> - NSImageView *picture_view = [[NSImageView alloc] initWithFrame:
> - picture_rect];
> - char *qemu_image_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png");
> - NSString *qemu_image_path = [NSString stringWithUTF8String:qemu_image_path_c];
> - g_free(qemu_image_path_c);
> - NSImage *qemu_image = [[NSImage alloc] initWithContentsOfFile:qemu_image_path];
> - [picture_view setImage: qemu_image];
> - [picture_view setImageScaling: NSImageScaleProportionallyUpOrDown];
> - [superView addSubview: picture_view];
> -
> - /* Make the name label */
> - NSBundle *bundle = [NSBundle mainBundle];
> - if (bundle) {
> - x = 0;
> - y = y - 25;
> - int name_width = about_width, name_height = 20;
> - NSRect name_rect = NSMakeRect(x, y, name_width, name_height);
> - NSTextField *name_label = [[NSTextField alloc] initWithFrame: name_rect];
> - [name_label setEditable: NO];
> - [name_label setBezeled: NO];
> - [name_label setDrawsBackground: NO];
> - [name_label setAlignment: NSTextAlignmentCenter];
> - NSString *qemu_name = [[bundle executablePath] lastPathComponent];
> - [name_label setStringValue: qemu_name];
> - [superView addSubview: name_label];
> + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
> + char *icon_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png");
> + NSString *icon_path = [NSString stringWithUTF8String:icon_path_c];
> + g_free(icon_path_c);
> + NSImage *icon = [[NSImage alloc] initWithContentsOfFile:icon_path];
> + NSString *version = @"QEMU emulator version " QEMU_FULL_VERSION;
> + NSString *copyright = @QEMU_COPYRIGHT;
> + NSDictionary *options;
> + if (icon) {
> + options = @{
> + NSAboutPanelOptionApplicationIcon : icon,
> + NSAboutPanelOptionApplicationVersion : version,
> + @"Copyright" : copyright,
> + };
> + [icon release];
> + } else {
> + options = @{
> + NSAboutPanelOptionApplicationVersion : version,
> + @"Copyright" : copyright,
> + };
> }
> -
> - /* Set the version label's attributes */
> - x = 0;
> - y = 50;
> - int version_width = about_width, version_height = 20;
> - NSRect version_rect = NSMakeRect(x, y, version_width, version_height);
> - NSTextField *version_label = [[NSTextField alloc] initWithFrame:
> - version_rect];
> - [version_label setEditable: NO];
> - [version_label setBezeled: NO];
> - [version_label setAlignment: NSTextAlignmentCenter];
> - [version_label setDrawsBackground: NO];
> -
> - /* Create the version string*/
> - NSString *version_string;
> - version_string = [[NSString alloc] initWithFormat:
> - @"QEMU emulator version %s", QEMU_FULL_VERSION];
> - [version_label setStringValue: version_string];
> - [superView addSubview: version_label];
> -
> - /* Make copyright label */
> - x = 0;
> - y = 35;
> - int copyright_width = about_width, copyright_height = 20;
> - NSRect copyright_rect = NSMakeRect(x, y, copyright_width, copyright_height);
> - NSTextField *copyright_label = [[NSTextField alloc] initWithFrame:
> - copyright_rect];
> - [copyright_label setEditable: NO];
> - [copyright_label setBezeled: NO];
> - [copyright_label setDrawsBackground: NO];
> - [copyright_label setAlignment: NSTextAlignmentCenter];
> - [copyright_label setStringValue: [NSString stringWithFormat: @"%s",
> - QEMU_COPYRIGHT]];
> - [superView addSubview: copyright_label];
> + [NSApp orderFrontStandardAboutPanelWithOptions:options];
> + [pool release];
> }
>
> /* Used by the Speed menu items */
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 2/4] datadir: Use bundle mechanism
2022-02-28 0:57 [PATCH v3 0/4] cutils: Introduce bundle mechanism Akihiko Odaki
2022-02-28 0:57 ` [PATCH v3 1/4] " Akihiko Odaki
2022-02-28 0:57 ` [PATCH] ui/cocoa: Use the standard about panel Akihiko Odaki
@ 2022-02-28 0:57 ` Akihiko Odaki
2022-02-28 0:57 ` [PATCH v3 3/4] ui/icons: " Akihiko Odaki
2022-02-28 0:57 ` [PATCH v3 4/4] net: " Akihiko Odaki
4 siblings, 0 replies; 8+ messages in thread
From: Akihiko Odaki @ 2022-02-28 0:57 UTC (permalink / raw)
Cc: Peter Maydell, Jason Wang, qemu-devel, Programmingkid,
Philippe Mathieu-Daudé, Gerd Hoffmann, Akihiko Odaki
softmmu/datadir.c had its own implementation to find files in the
build tree, but now bundle mechanism provides the unified
implementation which works for datadir and the other files.
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
configure | 2 ++
meson.build | 2 +-
softmmu/datadir.c | 35 ++++++++++++-----------------------
3 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/configure b/configure
index c56ed53ee36..fda1a35cbc0 100755
--- a/configure
+++ b/configure
@@ -3089,6 +3089,8 @@ for f in $LINKS ; do
fi
done
+symlink ../../pc-bios qemu-bundle/share/qemu
+
(for i in $cross_cc_vars; do
export $i
done
diff --git a/meson.build b/meson.build
index 8df40bfac4d..a2c987b41d6 100644
--- a/meson.build
+++ b/meson.build
@@ -1469,7 +1469,7 @@ endif
config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / get_option('bindir'))
config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix'))
config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') / qemu_confdir)
-config_host_data.set_quoted('CONFIG_QEMU_DATADIR', get_option('prefix') / qemu_datadir)
+config_host_data.set_quoted('CONFIG_QEMU_BUNDLE_DATADIR', qemu_datadir)
config_host_data.set_quoted('CONFIG_QEMU_DESKTOPDIR', get_option('prefix') / qemu_desktopdir)
config_host_data.set_quoted('CONFIG_QEMU_FIRMWAREPATH', get_option('qemu_firmwarepath'))
config_host_data.set_quoted('CONFIG_QEMU_HELPERDIR', get_option('prefix') / get_option('libexecdir'))
diff --git a/softmmu/datadir.c b/softmmu/datadir.c
index 504c4665bed..2d8366039d9 100644
--- a/softmmu/datadir.c
+++ b/softmmu/datadir.c
@@ -36,6 +36,7 @@ char *qemu_find_file(int type, const char *name)
int i;
const char *subdir;
char *buf;
+ char *bundle;
/* Try the name as a straight path first */
if (access(name, R_OK) == 0) {
@@ -62,6 +63,16 @@ char *qemu_find_file(int type, const char *name)
}
g_free(buf);
}
+
+ bundle = g_strdup_printf("%s/%s%s",
+ CONFIG_QEMU_BUNDLE_DATADIR, subdir, name);
+ buf = find_bundle(bundle);
+ g_free(bundle);
+ if (buf) {
+ trace_load_file(name, buf);
+ return buf;
+ }
+
return NULL;
}
@@ -84,26 +95,6 @@ void qemu_add_data_dir(char *path)
data_dir[data_dir_idx++] = path;
}
-/*
- * Find a likely location for support files using the location of the binary.
- * When running from the build tree this will be "$bindir/pc-bios".
- * Otherwise, this is CONFIG_QEMU_DATADIR (possibly relocated).
- *
- * The caller must use g_free() to free the returned data when it is
- * no longer required.
- */
-static char *find_datadir(void)
-{
- g_autofree char *dir = NULL;
-
- dir = g_build_filename(qemu_get_exec_dir(), "pc-bios", NULL);
- if (g_file_test(dir, G_FILE_TEST_IS_DIR)) {
- return g_steal_pointer(&dir);
- }
-
- return get_relocated_path(CONFIG_QEMU_DATADIR);
-}
-
void qemu_add_default_firmwarepath(void)
{
char **dirs;
@@ -115,9 +106,6 @@ void qemu_add_default_firmwarepath(void)
qemu_add_data_dir(get_relocated_path(dirs[i]));
}
g_strfreev(dirs);
-
- /* try to find datadir relative to the executable path */
- qemu_add_data_dir(find_datadir());
}
void qemu_list_data_dirs(void)
@@ -126,4 +114,5 @@ void qemu_list_data_dirs(void)
for (i = 0; i < data_dir_idx; i++) {
printf("%s\n", data_dir[i]);
}
+ list_bundle_candidates(CONFIG_QEMU_BUNDLE_DATADIR);
}
--
2.32.0 (Apple Git-132)
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v3 3/4] ui/icons: Use bundle mechanism
2022-02-28 0:57 [PATCH v3 0/4] cutils: Introduce bundle mechanism Akihiko Odaki
` (2 preceding siblings ...)
2022-02-28 0:57 ` [PATCH v3 2/4] datadir: Use bundle mechanism Akihiko Odaki
@ 2022-02-28 0:57 ` Akihiko Odaki
2022-02-28 0:57 ` [PATCH v3 4/4] net: " Akihiko Odaki
4 siblings, 0 replies; 8+ messages in thread
From: Akihiko Odaki @ 2022-02-28 0:57 UTC (permalink / raw)
Cc: Peter Maydell, Jason Wang, qemu-devel, Programmingkid,
Philippe Mathieu-Daudé, Gerd Hoffmann, Akihiko Odaki
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
configure | 10 ++++++++++
meson.build | 3 +--
ui/cocoa.m | 20 +++++++++++---------
ui/gtk.c | 8 +++++---
ui/sdl2.c | 18 +++++++++++-------
5 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/configure b/configure
index fda1a35cbc0..80d36a85bc5 100755
--- a/configure
+++ b/configure
@@ -3089,6 +3089,16 @@ for f in $LINKS ; do
fi
done
+for icon_extension in bmp png ; do
+ for icon_file in $source_path/ui/icons/qemu_*.$icon_extension ; do
+ icon_basename=${icon_file%.$icon_extension}
+ icon_name=${icon_basename#$source_path/ui/icons/qemu_}
+ icon_dir=qemu-bundle/share/icons/hicolor/$icon_name/apps
+ symlink $icon_file $icon_dir/qemu.$icon_extension
+ done
+done
+
+symlink $source_path/ui/icons/qemu.svg qemu-bundle/share/icons/hicolor/scalable/apps/qemu.svg
symlink ../../pc-bios qemu-bundle/share/qemu
(for i in $cross_cc_vars; do
diff --git a/meson.build b/meson.build
index a2c987b41d6..f7e64a74545 100644
--- a/meson.build
+++ b/meson.build
@@ -1472,8 +1472,7 @@ config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') / qemu_c
config_host_data.set_quoted('CONFIG_QEMU_BUNDLE_DATADIR', qemu_datadir)
config_host_data.set_quoted('CONFIG_QEMU_DESKTOPDIR', get_option('prefix') / qemu_desktopdir)
config_host_data.set_quoted('CONFIG_QEMU_FIRMWAREPATH', get_option('qemu_firmwarepath'))
-config_host_data.set_quoted('CONFIG_QEMU_HELPERDIR', get_option('prefix') / get_option('libexecdir'))
-config_host_data.set_quoted('CONFIG_QEMU_ICONDIR', get_option('prefix') / qemu_icondir)
+config_host_data.set_quoted('CONFIG_QEMU_BUNDLE_ICONDIR', qemu_icondir)
config_host_data.set_quoted('CONFIG_QEMU_LOCALEDIR', get_option('prefix') / get_option('localedir'))
config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDIR', get_option('prefix') / get_option('localstatedir'))
config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') / qemu_moddir)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index a8f1cdaf926..e5e49c50fbb 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -1477,15 +1477,17 @@ - (void)make_about_window
NSRect picture_rect = NSMakeRect(x, y, picture_width, picture_height);
/* Make the picture of QEMU */
- NSImageView *picture_view = [[NSImageView alloc] initWithFrame:
- picture_rect];
- char *qemu_image_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png");
- NSString *qemu_image_path = [NSString stringWithUTF8String:qemu_image_path_c];
- g_free(qemu_image_path_c);
- NSImage *qemu_image = [[NSImage alloc] initWithContentsOfFile:qemu_image_path];
- [picture_view setImage: qemu_image];
- [picture_view setImageScaling: NSImageScaleProportionallyUpOrDown];
- [superView addSubview: picture_view];
+ char *qemu_image_path_c = find_bundle(CONFIG_QEMU_BUNDLE_ICONDIR "/hicolor/512x512/apps/qemu.png");
+ if (qemu_image_path_c) {
+ NSString *qemu_image_path = [NSString stringWithUTF8String:qemu_image_path_c];
+ g_free(qemu_image_path_c);
+ NSImageView *picture_view = [[NSImageView alloc] initWithFrame:
+ picture_rect];
+ NSImage *qemu_image = [[NSImage alloc] initWithContentsOfFile:qemu_image_path];
+ [picture_view setImage: qemu_image];
+ [picture_view setImageScaling: NSImageScaleProportionallyUpOrDown];
+ [superView addSubview: picture_view];
+ }
/* Make the name label */
NSBundle *bundle = [NSBundle mainBundle];
diff --git a/ui/gtk.c b/ui/gtk.c
index a8567b9ddc8..a86d1c126f0 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -2296,9 +2296,11 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
s->opts = opts;
theme = gtk_icon_theme_get_default();
- dir = get_relocated_path(CONFIG_QEMU_ICONDIR);
- gtk_icon_theme_prepend_search_path(theme, dir);
- g_free(dir);
+ dir = find_bundle(CONFIG_QEMU_BUNDLE_ICONDIR);
+ if (dir) {
+ gtk_icon_theme_prepend_search_path(theme, dir);
+ g_free(dir);
+ }
g_set_prgname("qemu");
s->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 46a252d7d9d..9d1f6e74cb5 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -893,15 +893,19 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
}
#ifdef CONFIG_SDL_IMAGE
- dir = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/128x128/apps/qemu.png");
- icon = IMG_Load(dir);
+ dir = find_bundle(CONFIG_QEMU_BUNDLE_ICONDIR "/hicolor/128x128/apps/qemu.png");
+ if (dir) {
+ icon = IMG_Load(dir);
+ }
#else
/* Load a 32x32x4 image. White pixels are transparent. */
- dir = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/32x32/apps/qemu.bmp");
- icon = SDL_LoadBMP(dir);
- if (icon) {
- uint32_t colorkey = SDL_MapRGB(icon->format, 255, 255, 255);
- SDL_SetColorKey(icon, SDL_TRUE, colorkey);
+ dir = find_bundle(CONFIG_QEMU_BUNDLE_ICONDIR "/hicolor/32x32/apps/qemu.bmp");
+ if (dir) {
+ icon = SDL_LoadBMP(dir);
+ if (icon) {
+ uint32_t colorkey = SDL_MapRGB(icon->format, 255, 255, 255);
+ SDL_SetColorKey(icon, SDL_TRUE, colorkey);
+ }
}
#endif
g_free(dir);
--
2.32.0 (Apple Git-132)
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v3 4/4] net: Use bundle mechanism
2022-02-28 0:57 [PATCH v3 0/4] cutils: Introduce bundle mechanism Akihiko Odaki
` (3 preceding siblings ...)
2022-02-28 0:57 ` [PATCH v3 3/4] ui/icons: " Akihiko Odaki
@ 2022-02-28 0:57 ` Akihiko Odaki
4 siblings, 0 replies; 8+ messages in thread
From: Akihiko Odaki @ 2022-02-28 0:57 UTC (permalink / raw)
Cc: Peter Maydell, Jason Wang, qemu-devel, Programmingkid,
Philippe Mathieu-Daudé, Gerd Hoffmann, Akihiko Odaki
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
configure | 1 +
include/net/net.h | 2 +-
meson.build | 1 +
net/tap.c | 6 +++++-
qemu-options.hx | 4 ++--
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 80d36a85bc5..63df8f5886e 100755
--- a/configure
+++ b/configure
@@ -3100,6 +3100,7 @@ done
symlink $source_path/ui/icons/qemu.svg qemu-bundle/share/icons/hicolor/scalable/apps/qemu.svg
symlink ../../pc-bios qemu-bundle/share/qemu
+symlink ../../qemu-bridge-helper qemu-bundle/libexec/qemu-bridge-helper
(for i in $cross_cc_vars; do
export $i
diff --git a/include/net/net.h b/include/net/net.h
index 523136c7acb..4a5ed27a4b7 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -228,7 +228,7 @@ NetClientState *net_hub_port_find(int hub_id);
#define DEFAULT_NETWORK_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifup"
#define DEFAULT_NETWORK_DOWN_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifdown"
-#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper"
+#define DEFAULT_BUNDLE_BRIDGE_HELPER CONFIG_QEMU_BUNDLE_HELPERDIR "/qemu-bridge-helper"
#define DEFAULT_BRIDGE_INTERFACE "br0"
void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
diff --git a/meson.build b/meson.build
index f7e64a74545..95ee0a7c14e 100644
--- a/meson.build
+++ b/meson.build
@@ -1472,6 +1472,7 @@ config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') / qemu_c
config_host_data.set_quoted('CONFIG_QEMU_BUNDLE_DATADIR', qemu_datadir)
config_host_data.set_quoted('CONFIG_QEMU_DESKTOPDIR', get_option('prefix') / qemu_desktopdir)
config_host_data.set_quoted('CONFIG_QEMU_FIRMWAREPATH', get_option('qemu_firmwarepath'))
+config_host_data.set_quoted('CONFIG_QEMU_BUNDLE_HELPERDIR', get_option('libexecdir'))
config_host_data.set_quoted('CONFIG_QEMU_BUNDLE_ICONDIR', qemu_icondir)
config_host_data.set_quoted('CONFIG_QEMU_LOCALEDIR', get_option('prefix') / get_option('localedir'))
config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDIR', get_option('prefix') / get_option('localstatedir'))
diff --git a/net/tap.c b/net/tap.c
index c5cbeaa7a2b..91415cd376c 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -508,7 +508,11 @@ static int net_bridge_run_helper(const char *helper, const char *bridge,
sigprocmask(SIG_BLOCK, &mask, &oldmask);
if (!helper) {
- helper = default_helper = get_relocated_path(DEFAULT_BRIDGE_HELPER);
+ helper = default_helper = find_bundle(DEFAULT_BUNDLE_BRIDGE_HELPER);
+ if (!helper) {
+ error_setg(errp, "bridge helper not found");
+ return -1;
+ }
}
if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) == -1) {
diff --git a/qemu-options.hx b/qemu-options.hx
index 094a6c1d7c2..a5c03e2caf3 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2665,7 +2665,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
" to configure it and 'dfile' (default=" DEFAULT_NETWORK_DOWN_SCRIPT ")\n"
" to deconfigure it\n"
" use '[down]script=no' to disable script execution\n"
- " use network helper 'helper' (default=" DEFAULT_BRIDGE_HELPER ") to\n"
+ " use network helper 'helper' (default=" DEFAULT_BUNDLE_BRIDGE_HELPER ") to\n"
" configure it\n"
" use 'fd=h' to connect to an already opened TAP interface\n"
" use 'fds=x:y:...:z' to connect to already opened multiqueue capable TAP interfaces\n"
@@ -2684,7 +2684,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
"-netdev bridge,id=str[,br=bridge][,helper=helper]\n"
" configure a host TAP network backend with ID 'str' that is\n"
" connected to a bridge (default=" DEFAULT_BRIDGE_INTERFACE ")\n"
- " using the program 'helper (default=" DEFAULT_BRIDGE_HELPER ")\n"
+ " using the program 'helper (default=" DEFAULT_BUNDLE_BRIDGE_HELPER ")\n"
#endif
#ifdef __linux__
"-netdev l2tpv3,id=str,src=srcaddr,dst=dstaddr[,srcport=srcport][,dstport=dstport]\n"
--
2.32.0 (Apple Git-132)
^ permalink raw reply related [flat|nested] 8+ messages in thread